emu-mirrors/ryujinx-final
Archived
0
0
Fork 0
Code Activity

Unbind input on middle click (#2358)

Browse source 
* Unbind input on middle click

* Clear _middleMousePressed unconditionally

* Remove unneded initialization code

* Swap conditions

* CR fixes
This commit is contained in:
ooa113y 2021-06-23 23:51:29 +03:00 committed by GitHub
parent 7cf3ce7ed2
commit 9efe124fc5
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 9 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
Ryujinx/Ui/Windows/ControllerWindow.cs
View file

@ -105,13 +105,13 @@ namespace Ryujinx.Ui.Windows
private IGamepadDriver _gtk3KeyboardDriver; private IGamepadDriver _gtk3KeyboardDriver;
private IGamepad _selectedGamepad; private IGamepad _selectedGamepad;
private bool _mousePressed; private bool _mousePressed;
private bool _middleMousePressed;
public ControllerWindow(MainWindow mainWindow, PlayerIndex controllerId) : this(mainWindow, new Builder("Ryujinx.Ui.Windows.ControllerWindow.glade"), controllerId) { } public ControllerWindow(MainWindow mainWindow, PlayerIndex controllerId) : this(mainWindow, new Builder("Ryujinx.Ui.Windows.ControllerWindow.glade"), controllerId) { }
private ControllerWindow(MainWindow mainWindow, Builder builder, PlayerIndex controllerId) : base(builder.GetObject("_controllerWin").Handle) private ControllerWindow(MainWindow mainWindow, Builder builder, PlayerIndex controllerId) : base(builder.GetObject("_controllerWin").Handle)
{ {
_mainWindow = mainWindow; _mainWindow = mainWindow;
_mousePressed = false;
_selectedGamepad = null; _selectedGamepad = null;
// NOTE: To get input in this window, we need to bind a custom keyboard driver instead of using the InputManager one as the main window isn't focused... // NOTE: To get input in this window, we need to bind a custom keyboard driver instead of using the InputManager one as the main window isn't focused...
@ -852,11 +852,17 @@ namespace Ryujinx.Ui.Windows
Application.Invoke(delegate Application.Invoke(delegate
{ {
if (pressedButton != "") if (_middleMousePressed)
{
button.Label = "Unbound";
}
else if (pressedButton != "")
{ {
button.Label = pressedButton; button.Label = pressedButton;
} }
_middleMousePressed = false;
ButtonPressEvent -= MouseClick; ButtonPressEvent -= MouseClick;
keyboard.Dispose(); keyboard.Dispose();
@ -883,6 +889,7 @@ namespace Ryujinx.Ui.Windows
private void MouseClick(object sender, ButtonPressEventArgs args) private void MouseClick(object sender, ButtonPressEventArgs args)
{ {
_mousePressed = true; _mousePressed = true;
_middleMousePressed = args.Event.Button == 2;
} }
private void SetProfiles() private void SetProfiles()