diff options
| author | Isaac Marovitz <42140194+IsaacMarovitz@users.noreply.github.com> | 2024-04-17 22:52:12 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-04-17 18:52:12 -0300 |
| commit | 446f2854a5af18aef7151f95d64e0fe66a3498b8 (patch) | |
| tree | 2d92deeffc089cdad97ed49d13b0e858ddabd404 /src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs | |
| parent | 8884d1fd732c9ba788f0ab711e6a9f507d934ac8 (diff) | |
Ava UI: Input Menu Refactor (#5826)
* Refactor
* Apply suggestions from code review
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Update src/Ryujinx.Input/ButtonValueType.cs
Co-authored-by: Ac_K <Acoustik666@gmail.com>
* Add empty line
* Requested renames
* Update src/Ryujinx/UI/Views/Settings/SettingsHotkeysView.axaml.cs
Co-authored-by: gdkchan <gab.dark.100@gmail.com>
* Make parent models private readonly
* Fix ControllerInputView
* Make line shorter
* Mac keys in locale
* Double line break
* Fix build
* Get rid of _isValid
* Fix potential race condition
* Rename HasAnyButtonPressed to IsAnyButtonPressed
* Use switches
* Simplify enumeration
---------
Co-authored-by: Ac_K <Acoustik666@gmail.com>
Co-authored-by: gdkchan <gab.dark.100@gmail.com>
Co-authored-by: TSR Berry <20988865+TSRBerry@users.noreply.github.com>
Diffstat (limited to 'src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs')
| -rw-r--r-- | src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs b/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs index 6712657f..d0b8266f 100644 --- a/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs +++ b/src/Ryujinx.Gtk3/UI/Windows/ControllerWindow.cs @@ -10,6 +10,7 @@ using Ryujinx.Input; using Ryujinx.Input.Assigner; using Ryujinx.Input.GTK3; using Ryujinx.UI.Common.Configuration; +using Ryujinx.UI.Helper; using Ryujinx.UI.Widgets; using System; using System.Collections.Generic; @@ -17,6 +18,7 @@ using System.IO; using System.Reflection; using System.Text.Json; using System.Threading; +using Button = Ryujinx.Input.Button; using ConfigGamepadInputId = Ryujinx.Common.Configuration.Hid.Controller.GamepadInputId; using ConfigStickInputId = Ryujinx.Common.Configuration.Hid.Controller.StickInputId; using GUI = Gtk.Builder.ObjectAttribute; @@ -887,13 +889,13 @@ namespace Ryujinx.UI.Windows Thread.Sleep(10); assigner.ReadInput(); - if (_mousePressed || keyboard.IsPressed(Ryujinx.Input.Key.Escape) || assigner.HasAnyButtonPressed() || assigner.ShouldCancel()) + if (_mousePressed || keyboard.IsPressed(Ryujinx.Input.Key.Escape) || assigner.IsAnyButtonPressed() || assigner.ShouldCancel()) { break; } } - string pressedButton = assigner.GetPressedButton(); + string pressedButton = ButtonHelper.ToString(assigner.GetPressedButton() ?? new Button(Input.Key.Unknown)); Application.Invoke(delegate { |