manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-03-13 15:50:18 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

addressed review

Browse source
This commit is contained in:
Emmanuel Hansen 2022-06-06 09:10:18 +00:00
parent 8eee0ef41e
commit 78b54fcf16
9 changed files with 131 additions and 146 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Ryujinx.Ava/Assets/Locales/en_US.json
View file

@ -554,5 +554,7 @@
"SettingsTabHotkeysPauseHotkey": "Pause:",
"SettingsTabHotkeysToggleMuteHotkey": "Mute:",
"ControllerMotionTitle": "Motion Control Settings",
"ControllerRumbleTitle": "Rumble Settings"
"ControllerRumbleTitle": "Rumble Settings",
"SettingsSelectThemeFileDialogTitle" : "Select Theme File",
"SettingsXamlThemeFile" : "Xaml Theme File"
}

12
Ryujinx.Ava/Ui/Applet/AvaHostUiHandler.cs
View file

@ -1,5 +1,6 @@
using Avalonia.Controls;
using Avalonia.Threading;
using FluentAvalonia.UI.Controls;
using Ryujinx.Ava.Common.Locale;
using Ryujinx.Ava.Ui.Controls;
using Ryujinx.Ava.Ui.Windows;
@ -57,8 +58,15 @@ namespace Ryujinx.Ava.Ui.Applet
bool opened = false;
UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent, title, message, "",
LocaleManager.Instance["DialogOpenSettingsWindow"], "", "Close", 0xF4A3, deferEvent,
UserResult response = await ContentDialogHelper.ShowDeferredContentDialog(_parent,
title,
message,
"",
LocaleManager.Instance["DialogOpenSettingsWindow"],
"",
LocaleManager.Instance["SettingsButtonClose"],
(int)Symbol.Important,
deferEvent,
async (window) =>
{
if (opened)

33
Ryujinx.Ava/Ui/Controls/ButtonKeyAssigner.cs
View file

@ -12,6 +12,18 @@ namespace Ryujinx.Ava.Ui.Controls
{
public class ButtonKeyAssigner
{
public class ButtonAssignedEventArgs : EventArgs
{
public ToggleButton Button { get; }
public bool IsAssigned { get; }
public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
{
Button = button;
IsAssigned = isAssigned;
}
}
public ToggleButton ToggledButton { get; set; }
private bool _isWaitingForInput;
@ -67,22 +79,15 @@ namespace Ryujinx.Ava.Ui.Controls
await Dispatcher.UIThread.InvokeAsync(() =>
{
string pressedButton = assigner.GetPressedButton();
if (_shouldUnbind)
{
try
{
SetButtonText(ToggledButton, "Unbound");
}
catch { }
}
else if (pressedButton != "")
{
try
{
SetButtonText(ToggledButton, pressedButton);
}
catch { }
}
_shouldUnbind = false;
_isWaitingForInput = false;
@ -109,17 +114,5 @@ namespace Ryujinx.Ava.Ui.Controls
ToggledButton.IsChecked = false;
_shouldUnbind = shouldUnbind;
}
public class ButtonAssignedEventArgs : EventArgs
{
public ToggleButton Button { get; }
public bool IsAssigned { get; }
public ButtonAssignedEventArgs(ToggleButton button, bool isAssigned)
{
Button = button;
IsAssigned = isAssigned;
}
}
}
}

119
Ryujinx.Ava/Ui/ViewModels/ControllerSettingsViewModel.cs
View file

@ -9,6 +9,7 @@ using Ryujinx.Ava.Input;
using Ryujinx.Ava.Ui.Controls;
using Ryujinx.Ava.Ui.Models;
using Ryujinx.Ava.Ui.Windows;
using Ryujinx.Common;
using Ryujinx.Common.Configuration;
using Ryujinx.Common.Configuration.Hid;
using Ryujinx.Common.Configuration.Hid.Controller;
@ -33,14 +34,19 @@ namespace Ryujinx.Ava.Ui.ViewModels
{
public class ControllerSettingsViewModel : BaseModel, IDisposable
{
private const string Disabled = "disabled";
private const string ProControllerResource = "Ryujinx.Ui.Common/Resources/Controller_ProCon.svg";
private const string JoyConPairResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConPair.svg";
private const string JoyConLeftResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConLeft.svg";
private const string JoyConRightResource = "Ryujinx.Ui.Common/Resources/Controller_JoyConRight.svg";
private const string KeyboardString = "keyboard";
private const string ControllerString = "controller";
private readonly MainWindow _mainWindow;
private PlayerIndex _playerId;
private int _controller;
private string _controllerImage;
private int _device;
private InputConfig _inputConfig;
private object _configuration;
private string _profileName;
private bool _isLoaded;
@ -125,20 +131,20 @@ namespace Ryujinx.Ava.Ui.ViewModels
switch (controller)
{
case ControllerType.Handheld:
ControllerImage = "Ryujinx.Ui.Common.Resources.Controller_JoyConPair.svg";
ControllerImage = JoyConPairResource;
break;
case ControllerType.ProController:
ControllerImage = "Ryujinx.Ui.Common.Resources.Controller_ProCon.svg";
ControllerImage = ProControllerResource;
break;
case ControllerType.JoyconPair:
ControllerImage = "Ryujinx.Ui.Common.Resources.Controller_JoyConPair.svg";
ControllerImage = JoyConPairResource;
break;
case ControllerType.JoyconLeft:
ControllerImage = "Ryujinx.Ui.Common.Resources.Controller_JoyConLeft.svg";
ControllerImage = JoyConLeftResource;
IsRight = false;
break;
case ControllerType.JoyconRight:
ControllerImage = "Ryujinx.Ui.Common.Resources.Controller_JoyConRight.svg";
ControllerImage = JoyConRightResource;
IsLeft = false;
break;
}
@ -174,7 +180,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
{
SvgSource source = new SvgSource();
source.Load(Assembly.GetAssembly(typeof(ConfigurationState)).GetManifestResourceStream(_controllerImage));
source.Load(EmbeddedResources.GetStream(_controllerImage));
image.Source = source;
}
@ -207,28 +213,22 @@ namespace Ryujinx.Ava.Ui.ViewModels
string selected = Devices[_device].Id;
if (selected == "disable")
if (selected != Disabled)
{
return;
}
LoadControllers();
if (_isLoaded)
{
LoadConfiguration(LoadDefaultConfiguration());
}
}
OnPropertyChanged();
NotifyChanges();
}
}
public InputConfig Config
{
get => _inputConfig;
set => _inputConfig = value;
}
public InputConfig Config { get; set; }
public ControllerSettingsViewModel(UserControl owner) : this()
{
@ -265,7 +265,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
ProfilesList = new AvaloniaList<string>();
DeviceList = new AvaloniaList<string>();
ControllerImage = "Ryujinx.Ui.Common.Resources.Controller_ProCon.svg";
ControllerImage = ProControllerResource;
PlayerIndexes.Add(new(PlayerIndex.Player1, LocaleManager.Instance["ControllerSettingsPlayer1"]));
PlayerIndexes.Add(new(PlayerIndex.Player2, LocaleManager.Instance["ControllerSettingsPlayer2"]));
@ -282,14 +282,14 @@ namespace Ryujinx.Ava.Ui.ViewModels
{
Config = inputConfig ?? ConfigurationState.Instance.Hid.InputConfig.Value.Find(inputConfig => inputConfig.PlayerIndex == _playerId);
if (Config is StandardKeyboardInputConfig)
if (Config is StandardKeyboardInputConfig keyboardInputConfig)
{
Configuration = new InputConfiguration<Key, ConfigStickInputId>(Config as StandardKeyboardInputConfig);
Configuration = new InputConfiguration<Key, ConfigStickInputId>(keyboardInputConfig);
}
if (Config is StandardControllerInputConfig)
if (Config is StandardControllerInputConfig controllerInputConfig)
{
Configuration = new InputConfiguration<ConfigGamepadInputId, ConfigStickInputId>(Config as StandardControllerInputConfig);
Configuration = new InputConfiguration<ConfigGamepadInputId, ConfigStickInputId>(controllerInputConfig);
}
}
@ -305,12 +305,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
if (Config is StandardKeyboardInputConfig)
{
ident = "keyboard";
ident = KeyboardString;
}
if (Config is StandardControllerInputConfig)
{
ident = "controller";
ident = ControllerString;
}
var item = Devices.FirstOrDefault(x => x.Id == $"{ident}/{Config.Id}");
@ -345,12 +345,12 @@ namespace Ryujinx.Ava.Ui.ViewModels
string id = GetCurrentGamepadId();
string selected = Devices[Device].Id;
if (selected == "disabled")
if (selected == Disabled)
{
return;
}
if (selected.StartsWith("keyboard"))
if (selected.StartsWith(KeyboardString))
{
if (_mainWindow.InputManager.KeyboardDriver is AvaloniaKeyboardDriver)
{
@ -393,7 +393,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
string selected = Devices[Device].Id;
if (selected == null || selected == "disabled")
if (selected == null || selected == Disabled)
{
return null;
}
@ -429,14 +429,14 @@ namespace Ryujinx.Ava.Ui.ViewModels
}
}
private static string GetShrinkedGamepadName(string str)
private static string GetShortGamepadName(string str)
{
const string ShrinkChars = "...";
const string Ellipsis = "...";
const int MaxSize = 50;
if (str.Length > MaxSize)
{
return str.Substring(0, MaxSize - ShrinkChars.Length) + ShrinkChars;
return str.Substring(0, MaxSize - Ellipsis.Length) + Ellipsis;
}
return str;
@ -448,29 +448,25 @@ namespace Ryujinx.Ava.Ui.ViewModels
{
Devices.Clear();
DeviceList.Clear();
Devices.Add(("disabled", LocaleManager.Instance["ControllerSettingsDeviceDisabled"]));
Devices.Add((Disabled, LocaleManager.Instance["ControllerSettingsDeviceDisabled"]));
foreach (string id in _mainWindow.InputManager.KeyboardDriver.GamepadsIds)
{
IGamepad gamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
using IGamepad gamepad = _mainWindow.InputManager.KeyboardDriver.GetGamepad(id);
if (gamepad != null)
{
Devices.Add(($"keyboard/{id}", $"{GetShrinkedGamepadName(gamepad.Name)} ({id})"));
gamepad.Dispose();
Devices.Add(($"keyboard/{id}", $"{GetShortGamepadName(gamepad.Name)} ({id})"));
}
}
foreach (string id in _mainWindow.InputManager.GamepadDriver.GamepadsIds)
{
IGamepad gamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
using IGamepad gamepad = _mainWindow.InputManager.GamepadDriver.GetGamepad(id);
if (gamepad != null)
{
Devices.Add(($"controller/{id}", $"{GetShrinkedGamepadName(gamepad.Name)} ({id})"));
gamepad.Dispose();
Devices.Add(($"controller/{id}", $"{GetShortGamepadName(gamepad.Name)} ({id})"));
}
}
@ -484,13 +480,13 @@ namespace Ryujinx.Ava.Ui.ViewModels
string path = AppDataManager.ProfilesDirPath;
string selected = Devices[Device == -1 ? 0 : Device].Id;
if (selected.StartsWith("keyboard"))
if (selected.StartsWith(KeyboardString))
{
path = Path.Combine(path, "keyboard");
path = Path.Combine(path, KeyboardString);
}
else if (selected.StartsWith("controller"))
else if (selected.StartsWith(ControllerString))
{
path = Path.Combine(path, "controller");
path = Path.Combine(path, ControllerString);
}
return path;
@ -522,7 +518,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
public InputConfig LoadDefaultConfiguration()
{
string activeDevice = "disabled";
string activeDevice = Disabled;
if (Devices.Count > 0 && Device < Devices.Count && Device >= 0)
{
@ -530,7 +526,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
}
InputConfig config;
if (activeDevice.StartsWith("keyboard"))
if (activeDevice.StartsWith(KeyboardString))
{
string id = activeDevice.Split("/")[1];
@ -540,8 +536,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
Backend = InputBackendType.WindowKeyboard,
Id = id,
ControllerType = ControllerType.ProController,
LeftJoycon =
new LeftJoyconCommonConfig<Key>
LeftJoycon = new LeftJoyconCommonConfig<Key>
{
DpadUp = Key.Up,
DpadDown = Key.Down,
@ -584,7 +579,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
}
};
}
else if (activeDevice.StartsWith("controller"))
else if (activeDevice.StartsWith(ControllerString))
{
bool isNintendoStyle = Devices.ToList().Find(x => x.Id == activeDevice).Name.Contains("Nintendo");
@ -601,8 +596,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
RangeLeft = 1.0f,
RangeRight = 1.0f,
TriggerThreshold = 0.5f,
LeftJoycon =
new LeftJoyconCommonConfig<ConfigGamepadInputId>
LeftJoycon = new LeftJoyconCommonConfig<ConfigGamepadInputId>
{
DpadUp = ConfigGamepadInputId.DpadUp,
DpadDown = ConfigGamepadInputId.DpadDown,
@ -614,16 +608,14 @@ namespace Ryujinx.Ava.Ui.ViewModels
ButtonSl = ConfigGamepadInputId.Unbound,
ButtonSr = ConfigGamepadInputId.Unbound
},
LeftJoyconStick =
new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
LeftJoyconStick = new JoyconConfigControllerStick<ConfigGamepadInputId, ConfigStickInputId>
{
Joystick = ConfigStickInputId.Left,
StickButton = ConfigGamepadInputId.LeftStick,
InvertStickX = false,
InvertStickY = false
},
RightJoycon =
new RightJoyconCommonConfig<ConfigGamepadInputId>
RightJoycon = new RightJoyconCommonConfig<ConfigGamepadInputId>
{
ButtonA = isNintendoStyle ? ConfigGamepadInputId.A : ConfigGamepadInputId.B,
ButtonB = isNintendoStyle ? ConfigGamepadInputId.B : ConfigGamepadInputId.A,
@ -751,15 +743,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
}
else
{
bool validFileName = true;
foreach (char invalidChar in Path.GetInvalidFileNameChars())
{
if (ProfileName.Contains(invalidChar))
{
validFileName = false;
}
}
bool validFileName = ProfileName.IndexOfAny(Path.GetInvalidFileNameChars()) == -1;
if (validFileName)
{
@ -837,7 +821,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
{
string selected = Devices[Device].Id;
if (selected.StartsWith("keyboard"))
if (selected.StartsWith(KeyboardString))
{
var inputConfig = Configuration as InputConfiguration<Key, ConfigStickInputId>;
inputConfig.Id = selected.Split("/")[1];
@ -854,7 +838,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
config.ControllerType = Controllers[_controller].Type;
config.PlayerIndex = _playerId;
int i = newConfig.FindIndex(x => x.PlayerIndex == this.PlayerId);
int i = newConfig.FindIndex(x => x.PlayerIndex == PlayerId);
if (i == -1)
{
newConfig.Add(config);
@ -865,10 +849,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
}
}
if (_mainWindow.AppHost != null)
{
_mainWindow.AppHost.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
}
_mainWindow.AppHost?.NpadManager.ReloadConfiguration(newConfig, ConfigurationState.Instance.Hid.EnableKeyboard, ConfigurationState.Instance.Hid.EnableMouse);
// Atomically replace and signal input change.
// NOTE: Do not modify InputConfig.Value directly as other code depends on the on-change event.

2
Ryujinx.Ava/Ui/ViewModels/MainWindowViewModel.cs
View file

@ -837,7 +837,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
public void LoadConfigurableHotKeys()
{
if(AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUi, out var showUiKey))
if (AvaloniaMappingHelper.TryGetAvaKey((Ryujinx.Input.Key)ConfigurationState.Instance.Hid.Hotkeys.Value.ShowUi, out var showUiKey))
{
ShowUiKey = new KeyGesture(showUiKey, KeyModifiers.None);
}

8
Ryujinx.Ava/Ui/ViewModels/SettingsViewModel.cs
View file

@ -47,7 +47,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
_resolutionScale = value;
OnPropertyChanged(nameof(CustomResolutionScale));
OnPropertyChanged(nameof(IsResolutionScaleActive));
OnPropertyChanged(nameof(IsCustomResolutionScaleActive));
}
}
public int GraphicsBackendMultithreadingIndex
@ -115,7 +115,7 @@ namespace Ryujinx.Ava.Ui.ViewModels
public bool IsSoundIoEnabled { get; set; }
public bool IsSDL2Enabled { get; set; }
public bool EnableCustomTheme { get; set; }
public bool IsResolutionScaleActive => _resolutionScale == 0;
public bool IsCustomResolutionScaleActive => _resolutionScale == 0;
public string TimeZone { get; set; }
public string ShaderDumpPath { get; set; }
@ -231,11 +231,11 @@ namespace Ryujinx.Ava.Ui.ViewModels
{
var dialog = new OpenFileDialog()
{
Title = "Select Theme File",
Title = LocaleManager.Instance["SettingsSelectThemeFileDialogTitle"],
AllowMultiple = false
};
dialog.Filters.Add(new FileDialogFilter() { Extensions = { "xaml" }, Name = "Xaml Theme File" });
dialog.Filters.Add(new FileDialogFilter() { Extensions = { "xaml" }, Name = LocaleManager.Instance["SettingsXamlThemeFile"] });
var file = await dialog.ShowAsync(_owner);

1
Ryujinx.Ava/Ui/Windows/ControllerSettingsWindow.axaml.cs
View file

@ -138,6 +138,7 @@ namespace Ryujinx.Ava.Ui.Windows
return assigner;
}
private void Button_Unchecked(object sender, RoutedEventArgs e)
{
_currentAssigner?.Cancel();

2
Ryujinx.Ava/Ui/Windows/SettingsWindow.axaml
View file

@ -574,7 +574,7 @@
LargeChange="1"
SimpleNumberFormat="F2"
SpinButtonPlacementMode="Inline"
IsVisible="{Binding IsResolutionScaleActive}"
IsVisible="{Binding IsCustomResolutionScaleActive}"
Maximum="100"
Minimum="0.1"
Value="{Binding CustomResolutionScale}" />

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

@ -239,7 +239,7 @@ namespace Ryujinx.Ui.Windows
_gtk3KeyboardDriver.Dispose();
}
private static string GetShrinkedGamepadName(string str)
private static string GetShortGamepadName(string str)
{
const string ShrinkChars = "...";
const int MaxSize = 50;
@ -264,7 +264,7 @@ namespace Ryujinx.Ui.Windows
if (gamepad != null)
{
_inputDevice.Append($"keyboard/{id}", GetShrinkedGamepadName($"{gamepad.Name} ({id})"));
_inputDevice.Append($"keyboard/{id}", GetShortGamepadName($"{gamepad.Name} ({id})"));
gamepad.Dispose();
}
@ -276,7 +276,7 @@ namespace Ryujinx.Ui.Windows
if (gamepad != null)
{
_inputDevice.Append($"controller/{id}", GetShrinkedGamepadName($"{gamepad.Name} ({id})"));
_inputDevice.Append($"controller/{id}", GetShortGamepadName($"{gamepad.Name} ({id})"));
gamepad.Dispose();
}