manuth/Ryujinx
1
0
Fork 0
mirror of https://git.naxdy.org/Mirror/Ryujinx.git synced 2025-01-10 04:39:11 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Merge branch 'cursorhideidletimesetting' of https://github.com/ProfOzpin/Ryujinx into cursorhideidletimesetting

Browse source
This commit is contained in:
ProfOzpin 2024-03-07 16:21:34 +04:00
commit d7dcb0717b
3 changed files with 11 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
src/Ryujinx.UI.Common/Configuration/ConfigurationState.cs
View file

@ -423,6 +423,7 @@ namespace Ryujinx.UI.Common.Configuration
/// </summary> /// </summary>
public ReactiveObject<List<InputConfig>> InputConfig { get; private set; } public ReactiveObject<List<InputConfig>> InputConfig { get; private set; }
public HidSection() public HidSection()
{ {
EnableKeyboard = new ReactiveObject<bool>(); EnableKeyboard = new ReactiveObject<bool>();
@ -1546,6 +1547,10 @@ namespace Ryujinx.UI.Common.Configuration
Hid.Hotkeys.Value = configurationFileFormat.Hotkeys; Hid.Hotkeys.Value = configurationFileFormat.Hotkeys;
Hid.InputConfig.Value = configurationFileFormat.InputConfig; Hid.InputConfig.Value = configurationFileFormat.InputConfig;
<<<<<<< HEAD
=======
>>>>>>> 5239ec712d5915a211a083d39764736dd02040e5
if (Hid.InputConfig.Value == null) if (Hid.InputConfig.Value == null)
{ {
Hid.InputConfig.Value = new List<InputConfig>(); Hid.InputConfig.Value = new List<InputConfig>();

1
src/Ryujinx/AppHost.cs
View file

@ -124,6 +124,7 @@ namespace Ryujinx.Ava
public bool ScreenshotRequested { get; set; } public bool ScreenshotRequested { get; set; }
public AppHost( public AppHost(
RendererHost renderer, RendererHost renderer,
InputManager inputManager, InputManager inputManager,
string applicationPath, string applicationPath,

5
src/Ryujinx/UI/ViewModels/SettingsViewModel.cs
View file

@ -408,6 +408,11 @@ namespace Ryujinx.Ava.UI.ViewModels
ShowConfirmExit = config.ShowConfirmExit; ShowConfirmExit = config.ShowConfirmExit;
HideCursor = (int)config.HideCursor.Value; HideCursor = (int)config.HideCursor.Value;
CursorHideIdleTime = config.CursorHideIdleTime.Value; CursorHideIdleTime = config.CursorHideIdleTime.Value;
<<<<<<< HEAD
=======
>>>>>>> 5239ec712d5915a211a083d39764736dd02040e5
GameDirectories.Clear(); GameDirectories.Clear();
GameDirectories.AddRange(config.UI.GameDirs.Value); GameDirectories.AddRange(config.UI.GameDirs.Value);