diff options
| author | Mary Guillemard <mary@mary.zone> | 2024-03-02 12:51:05 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-03-02 12:51:05 +0100 |
| commit | ec6cb0abb4b7669895b6e96fd7581c93b5abd691 (patch) | |
| tree | 128c862ff5faea0b219467656d4023bee7faefb5 /src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs | |
| parent | 53b5985da6b9d7b281d9fc25b93bfd1d1918a107 (diff) | |
infra: Make Avalonia the default UI (#6375)
* misc: Move Ryujinx project to Ryujinx.Gtk3
This breaks release CI for now but that's fine.
Signed-off-by: Mary Guillemard <mary@mary.zone>
* misc: Move Ryujinx.Ava project to Ryujinx
This breaks CI for now, but it's fine.
Signed-off-by: Mary Guillemard <mary@mary.zone>
* infra: Make Avalonia the default UI
Should fix CI after the previous changes.
GTK3 isn't build by the release job anymore, only by PR CI.
This also ensure that the test-ava update package is still generated to
allow update from the old testing channel.
Signed-off-by: Mary Guillemard <mary@mary.zone>
* Fix missing copy in create_app_bundle.sh
Signed-off-by: Mary Guillemard <mary@mary.zone>
* Fix syntax error
Signed-off-by: Mary Guillemard <mary@mary.zone>
---------
Signed-off-by: Mary Guillemard <mary@mary.zone>
Diffstat (limited to 'src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs')
| -rw-r--r-- | src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs | 159 |
1 files changed, 0 insertions, 159 deletions
diff --git a/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs b/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs deleted file mode 100644 index e71bbf64..00000000 --- a/src/Ryujinx.Ava/Input/AvaloniaMouseDriver.cs +++ /dev/null @@ -1,159 +0,0 @@ -using Avalonia; -using Avalonia.Controls; -using Avalonia.Input; -using Ryujinx.Input; -using System; -using System.Numerics; -using MouseButton = Ryujinx.Input.MouseButton; -using Size = System.Drawing.Size; - -namespace Ryujinx.Ava.Input -{ - internal class AvaloniaMouseDriver : IGamepadDriver - { - private Control _widget; - private bool _isDisposed; - private Size _size; - private readonly TopLevel _window; - - public bool[] PressedButtons { get; } - public Vector2 CurrentPosition { get; private set; } - public Vector2 Scroll { get; private set; } - - public string DriverName => "AvaloniaMouseDriver"; - public ReadOnlySpan<string> GamepadsIds => new[] { "0" }; - - public AvaloniaMouseDriver(TopLevel window, Control parent) - { - _widget = parent; - _window = window; - - _widget.PointerMoved += Parent_PointerMovedEvent; - _widget.PointerPressed += Parent_PointerPressedEvent; - _widget.PointerReleased += Parent_PointerReleasedEvent; - _widget.PointerWheelChanged += Parent_PointerWheelChanged; - - _window.PointerMoved += Parent_PointerMovedEvent; - _window.PointerPressed += Parent_PointerPressedEvent; - _window.PointerReleased += Parent_PointerReleasedEvent; - _window.PointerWheelChanged += Parent_PointerWheelChanged; - - PressedButtons = new bool[(int)MouseButton.Count]; - - _size = new Size((int)parent.Bounds.Width, (int)parent.Bounds.Height); - - parent.GetObservable(Visual.BoundsProperty).Subscribe(Resized); - } - - public event Action<string> OnGamepadConnected - { - add { } - remove { } - } - - public event Action<string> OnGamepadDisconnected - { - add { } - remove { } - } - - private void Resized(Rect rect) - { - _size = new Size((int)rect.Width, (int)rect.Height); - } - - private void Parent_PointerWheelChanged(object o, PointerWheelEventArgs args) - { - Scroll = new Vector2((float)args.Delta.X, (float)args.Delta.Y); - } - - private void Parent_PointerReleasedEvent(object o, PointerReleasedEventArgs args) - { - uint button = (uint)args.InitialPressMouseButton - 1; - - if ((uint)PressedButtons.Length > button) - { - PressedButtons[button] = false; - } - } - private void Parent_PointerPressedEvent(object o, PointerPressedEventArgs args) - { - uint button = (uint)args.GetCurrentPoint(_widget).Properties.PointerUpdateKind; - - if ((uint)PressedButtons.Length > button) - { - PressedButtons[button] = true; - } - } - - private void Parent_PointerMovedEvent(object o, PointerEventArgs args) - { - Point position = args.GetPosition(_widget); - - CurrentPosition = new Vector2((float)position.X, (float)position.Y); - } - - public void SetMousePressed(MouseButton button) - { - if ((uint)PressedButtons.Length > (uint)button) - { - PressedButtons[(uint)button] = true; - } - } - - public void SetMouseReleased(MouseButton button) - { - if ((uint)PressedButtons.Length > (uint)button) - { - PressedButtons[(uint)button] = false; - } - } - - public void SetPosition(double x, double y) - { - CurrentPosition = new Vector2((float)x, (float)y); - } - - public bool IsButtonPressed(MouseButton button) - { - if ((uint)PressedButtons.Length > (uint)button) - { - return PressedButtons[(uint)button]; - } - - return false; - } - - public Size GetClientSize() - { - return _size; - } - - public IGamepad GetGamepad(string id) - { - return new AvaloniaMouse(this); - } - - public void Dispose() - { - if (_isDisposed) - { - return; - } - - _isDisposed = true; - - _widget.PointerMoved -= Parent_PointerMovedEvent; - _widget.PointerPressed -= Parent_PointerPressedEvent; - _widget.PointerReleased -= Parent_PointerReleasedEvent; - _widget.PointerWheelChanged -= Parent_PointerWheelChanged; - - _window.PointerMoved -= Parent_PointerMovedEvent; - _window.PointerPressed -= Parent_PointerPressedEvent; - _window.PointerReleased -= Parent_PointerReleasedEvent; - _window.PointerWheelChanged -= Parent_PointerWheelChanged; - - _widget = null; - } - } -} |
