diff options
| author | Emmanuel Hansen <emmausssss@gmail.com> | 2022-09-19 18:05:26 +0000 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-09-19 15:05:26 -0300 |
| commit | 6f0395538b8e8af3bba7536b44780d57e51e8697 (patch) | |
| tree | 4d3f4f620dd287fc1ca38ea9ea722b6e022301dd /Ryujinx.Ava/Input | |
| parent | b9f1ff3c7748c6a2665e76d17e86c3b7228f44fe (diff) | |
Avalonia - Use embedded window for avalonia (#3674)
* wip
* use embedded window
* fix race condition on opengl Windows
* fix glx issues on prime nvidia
* fix mouse support win32
* clean up
* addressed review
* addressed review
* fix warnings
* fix sotware keyboard dialog
* Update Ryujinx.Ava/Ui/Applet/SwkbdAppletDialog.axaml.cs
Co-authored-by: gdkchan <gab.dark.100@gmail.com>
* remove double semi
Co-authored-by: gdkchan <gab.dark.100@gmail.com>
Diffstat (limited to 'Ryujinx.Ava/Input')
| -rw-r--r-- | Ryujinx.Ava/Input/AvaloniaMouseDriver.cs | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs b/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs index 74c435b5..9ad0310a 100644 --- a/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs +++ b/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs @@ -14,20 +14,27 @@ namespace Ryujinx.Ava.Input private Control _widget; private bool _isDisposed; private Size _size; + private readonly Window _window; public bool[] PressedButtons { get; } public Vector2 CurrentPosition { get; private set; } public Vector2 Scroll { get; private set; } - public AvaloniaMouseDriver(Control parent) + public AvaloniaMouseDriver(Window window, Control parent) { _widget = parent; + _window = window; _widget.PointerMoved += Parent_PointerMovedEvent; _widget.PointerPressed += Parent_PointerPressEvent; _widget.PointerReleased += Parent_PointerReleaseEvent; _widget.PointerWheelChanged += Parent_ScrollEvent; + + _window.PointerMoved += Parent_PointerMovedEvent; + _window.PointerPressed += Parent_PointerPressEvent; + _window.PointerReleased += Parent_PointerReleaseEvent; + _window.PointerWheelChanged += Parent_ScrollEvent; PressedButtons = new bool[(int)MouseButton.Count]; @@ -47,7 +54,6 @@ namespace Ryujinx.Ava.Input private void Parent_PointerReleaseEvent(object o, PointerReleasedEventArgs args) { - var pointerProperties = args.GetCurrentPoint(_widget).Properties; PressedButtons[(int)args.InitialPressMouseButton - 1] = false; } @@ -125,6 +131,11 @@ namespace Ryujinx.Ava.Input _widget.PointerReleased -= Parent_PointerReleaseEvent; _widget.PointerWheelChanged -= Parent_ScrollEvent; + _window.PointerMoved -= Parent_PointerMovedEvent; + _window.PointerPressed -= Parent_PointerPressEvent; + _window.PointerReleased -= Parent_PointerReleaseEvent; + _window.PointerWheelChanged -= Parent_ScrollEvent; + _widget = null; } } |