diff options
Diffstat (limited to 'src/Ryujinx.Ava/UI/Renderer')
| -rw-r--r-- | src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs | 14 | ||||
| -rw-r--r-- | src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs | 10 |
2 files changed, 13 insertions, 11 deletions
diff --git a/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs b/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs index e324b484..fa55c8d3 100644 --- a/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs +++ b/src/Ryujinx.Ava/UI/Renderer/EmbeddedWindow.cs @@ -34,7 +34,7 @@ namespace Ryujinx.Ava.UI.Renderer private UpdateBoundsCallbackDelegate _updateBoundsCallback; public event EventHandler<IntPtr> WindowCreated; - public event EventHandler<Size> SizeChanged; + public event EventHandler<Size> BoundsChanged; public EmbeddedWindow() { @@ -67,7 +67,7 @@ namespace Ryujinx.Ava.UI.Renderer private void StateChanged(Rect rect) { - SizeChanged?.Invoke(this, rect.Size); + BoundsChanged?.Invoke(this, rect.Size); _updateBoundsCallback?.Invoke(rect); } @@ -149,9 +149,10 @@ namespace Ryujinx.Ava.UI.Renderer msg == WindowsMessages.Rbuttonup || msg == WindowsMessages.Mousemove) { - Point rootVisualPosition = this.TranslatePoint(new Point((long)lParam & 0xFFFF, (long)lParam >> 16 & 0xFFFF), VisualRoot).Value; + Point rootVisualPosition = this.TranslatePoint(new Point((long)lParam & 0xFFFF, (long)lParam >> 16 & 0xFFFF), this).Value; Pointer pointer = new(0, PointerType.Mouse, true); +#pragma warning disable CS0618 // Type or member is obsolete (As of Avalonia 11, the constructors for PointerPressedEventArgs & PointerEventArgs are marked as obsolete) switch (msg) { case WindowsMessages.Lbuttondown: @@ -164,7 +165,7 @@ namespace Ryujinx.Ava.UI.Renderer var evnt = new PointerPressedEventArgs( this, pointer, - VisualRoot, + this, rootVisualPosition, (ulong)Environment.TickCount64, properties, @@ -184,7 +185,7 @@ namespace Ryujinx.Ava.UI.Renderer var evnt = new PointerReleasedEventArgs( this, pointer, - VisualRoot, + this, rootVisualPosition, (ulong)Environment.TickCount64, properties, @@ -201,7 +202,7 @@ namespace Ryujinx.Ava.UI.Renderer PointerMovedEvent, this, pointer, - VisualRoot, + this, rootVisualPosition, (ulong)Environment.TickCount64, new PointerPointProperties(RawInputModifiers.None, PointerUpdateKind.Other), @@ -212,6 +213,7 @@ namespace Ryujinx.Ava.UI.Renderer break; } } +#pragma warning restore CS0618 } } diff --git a/src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs b/src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs index b74265a3..12c18e4a 100644 --- a/src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs +++ b/src/Ryujinx.Ava/UI/Renderer/RendererHost.axaml.cs @@ -11,7 +11,7 @@ namespace Ryujinx.Ava.UI.Renderer public readonly EmbeddedWindow EmbeddedWindow; public event EventHandler<EventArgs> WindowCreated; - public event Action<object, Size> SizeChanged; + public event Action<object, Size> BoundsChanged; public RendererHost() { @@ -32,7 +32,7 @@ namespace Ryujinx.Ava.UI.Renderer private void Initialize() { EmbeddedWindow.WindowCreated += CurrentWindow_WindowCreated; - EmbeddedWindow.SizeChanged += CurrentWindow_SizeChanged; + EmbeddedWindow.BoundsChanged += CurrentWindow_BoundsChanged; Content = EmbeddedWindow; } @@ -42,7 +42,7 @@ namespace Ryujinx.Ava.UI.Renderer if (EmbeddedWindow != null) { EmbeddedWindow.WindowCreated -= CurrentWindow_WindowCreated; - EmbeddedWindow.SizeChanged -= CurrentWindow_SizeChanged; + EmbeddedWindow.BoundsChanged -= CurrentWindow_BoundsChanged; } GC.SuppressFinalize(this); @@ -55,9 +55,9 @@ namespace Ryujinx.Ava.UI.Renderer Dispose(); } - private void CurrentWindow_SizeChanged(object sender, Size e) + private void CurrentWindow_BoundsChanged(object sender, Size e) { - SizeChanged?.Invoke(sender, e); + BoundsChanged?.Invoke(sender, e); } private void CurrentWindow_WindowCreated(object sender, IntPtr e) |