Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat: [macOS] Support media player #3021

Merged

Conversation

MartinZikmund
Copy link
Member

GitHub Issue (If applicable): #626, closes: #3020

PR Type

What kind of change does this PR introduce?

  • Feature

What is the current behavior?

Not supported.

What is the new behavior?

Supported.

PR Checklist

Please check if your PR fulfills the following requirements:

Other information

Internal Issue (If applicable):

@gitpod-io
Copy link

gitpod-io bot commented Apr 17, 2020

@MartinZikmund MartinZikmund self-assigned this Apr 17, 2020
@MartinZikmund MartinZikmund marked this pull request as ready for review May 2, 2020 11:51
@jeromelaban
Copy link
Member

Thanks @MartinZikmund !

@MartinZikmund MartinZikmund force-pushed the dev/mazi/mediaplayer-macos branch from 22bd36e to efb6b08 Compare May 4, 2020 20:06
@MartinZikmund MartinZikmund added the ready-to-merge Automatically merge the PR once all '.mergify.yml' policies are met label May 5, 2020
…yer-macos

# Conflicts:
#	src/Uno.UWP/Generated/3.0.0.0/Windows.Media.Playback/MediaPlaybackItem.cs
#	src/Uno.UWP/Generated/3.0.0.0/Windows.Media.Playback/MediaPlaybackList.cs
@agneszitte
Copy link
Contributor

/azp run

@azure-pipelines
Copy link

Azure Pipelines successfully started running 1 pipeline(s).

@CLAassistant
Copy link

CLAassistant commented Jun 10, 2020

CLA assistant check
All committers have signed the CLA.

@ajpinedam
Copy link
Contributor

@MartinZikmund could you please rebase master? Thanks :)

@MartinZikmund
Copy link
Member Author

@MartinZikmund could you please rebase master? Thanks :)

Will do 👍

# Conflicts:
#	src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/MediaPlayerElement.cs
#	src/Uno.UI/Generated/3.0.0.0/Windows.UI.Xaml.Controls/MediaTransportControls.cs
#	src/Uno.UI/UI/Xaml/Controls/MediaPlayer/MediaTransportControls.MediaPlayer.cs
#	src/Uno.UI/UI/Xaml/Controls/MediaPlayer/MediaTransportControls.cs
@MartinZikmund
Copy link
Member Author

@ajpinedam Merged 👍

@@ -130,7 +130,10 @@ protected override Size MeasureOverride(Size availableSize)
if (double.IsNaN(Width) && double.IsNaN(Height))
{
availableSize.Width = availableSize.Width;
availableSize.Height = availableSize.Width / _currentRatio;
if (_currentRatio != 0)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Good catch! You should apply it also for the if (double.IsNaN(Height)) case :)

@@ -114,6 +137,22 @@ internal void RaiseNativeSizeChanged(CGSize size)
}
}

internal void DisplayFullscreen(UIElement element)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It's actually not really "full screen" but "full window". Probably sufficient for now, but I don't known if it would be easy to really go full screen on mac ?

@ajpinedam
Copy link
Contributor

@MartinZikmund thank you!. The CI is complaining, I will be looking into those issues and updating the PR.

@jeromelaban jeromelaban merged commit 16a732b into unoplatform:master Jul 10, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
ready-to-merge Automatically merge the PR once all '.mergify.yml' policies are met
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[macOS] Media player
6 participants