Skip to content

Allow attaching overlay window to specified background element rather than the VideoView #393

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.

Sign up for GitHub

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

Open
wants to merge 1 commit into
base: 3.x
Choose a base branch
from
Open

Allow attaching overlay window to specified background element rather than the VideoView #393

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
55 changes: 30 additions & 25 deletions src/LibVLCSharp.WPF/ForegroundWindow.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,8 @@ namespace LibVLCSharp.WPF
internal class ForegroundWindow : Window
{
Window? _wndhost;
readonly FrameworkElement _bckgnd;
readonly FrameworkElement _videoHost;
readonly FrameworkElement _backgroundElement;
readonly Point _zeroPoint = new Point(0, 0);
private readonly Grid _grid = new Grid();

Expand All @@ -30,7 +31,7 @@ internal UIElement? OverlayContent
}
}

internal ForegroundWindow(FrameworkElement background)
internal ForegroundWindow(FrameworkElement videoHost, FrameworkElement? background)
{
Title = "LibVLCSharp.WPF";
Height = 300;
Expand All @@ -42,23 +43,27 @@ internal ForegroundWindow(FrameworkElement background)
ShowInTaskbar = false;
Content = _grid;

DataContext = background.DataContext;
DataContext = videoHost.DataContext;

_bckgnd = background;
_bckgnd.DataContextChanged += Background_DataContextChanged;
_bckgnd.Loaded += Background_Loaded;
_bckgnd.Unloaded += Background_Unloaded;
if (background == null)
background = videoHost;

_backgroundElement = background;
_videoHost = videoHost;
_videoHost.DataContextChanged += VideoHost_DataContextChanged;
_videoHost.Loaded += VideoHost_Loaded;
_videoHost.Unloaded += VideoHost_Unloaded;
}

void Background_DataContextChanged(object? sender, DependencyPropertyChangedEventArgs e)
void VideoHost_DataContextChanged(object? sender, DependencyPropertyChangedEventArgs e)
{
DataContext = e.NewValue;
}

void Background_Unloaded(object? sender, RoutedEventArgs e)
void VideoHost_Unloaded(object? sender, RoutedEventArgs e)
{
_bckgnd.SizeChanged -= Bckgnd_SizeChanged;
_bckgnd.LayoutUpdated -= Bckgnd_LayoutUpdated;
_backgroundElement.SizeChanged -= Bckgnd_SizeChanged;
_backgroundElement.LayoutUpdated -= Bckgnd_LayoutUpdated;
if (_wndhost != null)
{
_wndhost.Closing -= Wndhost_Closing;
Expand All @@ -68,14 +73,14 @@ void Background_Unloaded(object? sender, RoutedEventArgs e)
Hide();
}

void Background_Loaded(object? sender, RoutedEventArgs e)
void VideoHost_Loaded(object? sender, RoutedEventArgs e)
{
if (_wndhost != null && IsVisible)
{
return;
}

_wndhost = GetWindow(_bckgnd);
_wndhost = GetWindow(_videoHost);
Trace.Assert(_wndhost != null);
if (_wndhost == null)
{
Expand All @@ -86,8 +91,8 @@ void Background_Loaded(object? sender, RoutedEventArgs e)

_wndhost.Closing += Wndhost_Closing;
_wndhost.LocationChanged += Wndhost_LocationChanged;
_bckgnd.LayoutUpdated += Bckgnd_LayoutUpdated;
_bckgnd.SizeChanged += Bckgnd_SizeChanged;
_backgroundElement.LayoutUpdated += Bckgnd_LayoutUpdated;
_backgroundElement.SizeChanged += Bckgnd_SizeChanged;

try
{
Expand Down Expand Up @@ -131,13 +136,13 @@ void AlignWithBackground()
return;
}

if (PresentationSource.FromVisual(_bckgnd) == null)
if (PresentationSource.FromVisual(_backgroundElement) == null)
{
return;
}

if (double.IsNaN(_bckgnd.ActualWidth) || double.IsNaN(_bckgnd.ActualHeight) ||
_bckgnd.ActualWidth == 0 || _bckgnd.ActualHeight == 0)
if (double.IsNaN(_backgroundElement.ActualWidth) || double.IsNaN(_backgroundElement.ActualHeight) ||
_backgroundElement.ActualWidth == 0 || _backgroundElement.ActualHeight == 0)
{
return;
}
Expand All @@ -162,19 +167,19 @@ void AlignWithBackground()
* The video view itself natively supports scaling.
*/

var startLocationFromScreen = _bckgnd.PointToScreen(_zeroPoint);
var startLocationFromScreen = _backgroundElement.PointToScreen(_zeroPoint);
var startLocationPoint = source.CompositionTarget.TransformFromDevice.Transform(startLocationFromScreen);
var endLocationFromScreen = _bckgnd.PointToScreen(new Point(_bckgnd.ActualWidth, _bckgnd.ActualHeight));
var endLocationFromScreen = _backgroundElement.PointToScreen(new Point(_backgroundElement.ActualWidth, _backgroundElement.ActualHeight));
var endLocationPoint = source.CompositionTarget.TransformFromDevice.Transform(endLocationFromScreen);

Left = Math.Min(startLocationPoint.X, endLocationPoint.X);
Top = Math.Min(startLocationPoint.Y, endLocationPoint.Y);
Width = Math.Abs(endLocationPoint.X - startLocationPoint.X);
Height = Math.Abs(endLocationPoint.Y - startLocationPoint.Y);

if (Math.Abs(Width - _bckgnd.ActualWidth) + Math.Abs(Height - _bckgnd.ActualHeight) > 0.5)
if (Math.Abs(Width - _backgroundElement.ActualWidth) + Math.Abs(Height - _backgroundElement.ActualHeight) > 0.5)
{
ScaleWindowContent(Width / _bckgnd.ActualWidth, Height / _bckgnd.ActualHeight);
ScaleWindowContent(Width / _backgroundElement.ActualWidth, Height / _backgroundElement.ActualHeight);
}
}

Expand Down Expand Up @@ -208,9 +213,9 @@ void Wndhost_Closing(object? sender, System.ComponentModel.CancelEventArgs e)

Close();

_bckgnd.DataContextChanged -= Background_DataContextChanged;
_bckgnd.Loaded -= Background_Loaded;
_bckgnd.Unloaded -= Background_Unloaded;
_videoHost.DataContextChanged -= VideoHost_DataContextChanged;
_videoHost.Loaded -= VideoHost_Loaded;
_videoHost.Unloaded -= VideoHost_Unloaded;
}

protected override void OnKeyDown(KeyEventArgs e)
Expand Down
7 changes: 6 additions & 1 deletion src/LibVLCSharp.WPF/VideoView.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,6 +57,11 @@ private static void OnMediaPlayerChanged(DependencyObject d, DependencyPropertyC
private ForegroundWindow? ForegroundWindow { get; set; }
private bool IsUpdatingContent { get; set; }
private UIElement? ViewContent { get; set; }

/// <summary>
/// Background element for this VideoView
/// </summary>
public FrameworkElement? BackgroundElement { get; set; } = null;

/// <summary>
/// ForegroundWindow management and MediaPlayer setup.
Expand All @@ -78,7 +83,7 @@ public override void OnApplyTemplate()

_videoHwndHost = controlHost;

ForegroundWindow = new ForegroundWindow(_videoHwndHost)
ForegroundWindow = new ForegroundWindow(_videoHwndHost, BackgroundElement)
{
OverlayContent = ViewContent
};
Expand Down
Loading