nintendo-back-up/Ryujinx
1
0
Fork 0
mirror of https://git.zaroz.cloud/nintendo-back-up/Ryujinx.git synced 2025-12-31 22:47:18 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Ava UI: Input Menu Refactor (#4998)"

Browse Source 
This reverts commit 49b37550ca.

This currently breaks the GTK GUI.
This commit is contained in:
TSR Berry
2023-10-21 15:19:21 +02:00
parent 49b37550ca
commit 638be5f296
30 changed files with 1152 additions and 2916 deletions
Download Patch File Download Diff File Expand all files Collapse all files

28
src/Ryujinx.Ava/UI/Helpers/ButtonKeyAssigner.cs
View File

@@ -1,8 +1,11 @@
using Avalonia.Controls;
using Avalonia.Controls.Primitives;
using Avalonia.LogicalTree;
using Avalonia.Threading;
using Ryujinx.Input;
using Ryujinx.Input.Assigner;
using System;
using System.Linq;
using System.Threading.Tasks;
namespace Ryujinx.Ava.UI.Helpers
@@ -12,12 +15,12 @@ namespace Ryujinx.Ava.UI.Helpers
internal class ButtonAssignedEventArgs : EventArgs
{
public ToggleButton Button { get; }
public ButtonValue? ButtonValue { get; }
public bool IsAssigned { get; }
public ButtonAssignedEventArgs(ToggleButton button, ButtonValue? buttonValue)
public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
{
Button = button;
ButtonValue = buttonValue;
IsAssigned = isAssigned;
}
}
@@ -75,11 +78,15 @@ namespace Ryujinx.Ava.UI.Helpers
await Dispatcher.UIThread.InvokeAsync(() =>
{
ButtonValue? pressedButton = assigner.GetPressedButton();
string pressedButton = assigner.GetPressedButton();
if (_shouldUnbind)
{
pressedButton = null;
SetButtonText(ToggledButton, "Unbound");
}
else if (pressedButton != "")
{
SetButtonText(ToggledButton, pressedButton);
}
_shouldUnbind = false;
@@ -87,8 +94,17 @@ namespace Ryujinx.Ava.UI.Helpers
ToggledButton.IsChecked = false;
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton));
ButtonAssigned?.Invoke(this, new ButtonAssignedEventArgs(ToggledButton, pressedButton != null));
static void SetButtonText(ToggleButton button, string text)
{
ILogical textBlock = button.GetLogicalDescendants().First(x => x is TextBlock);
if (textBlock != null && textBlock is TextBlock block)
{
block.Text = text;
}
}
});
}