From 7815fd574656e575b1d4b02ceab545b47be905e7 Mon Sep 17 00:00:00 2001
From: unknown <abramlujan@gmail.com>
Date: Sun, 10 Mar 2024 19:45:34 -0300
Subject: [PATCH] Move turbo multiplier setting to CPU tab

---
 src/Ryujinx/Assets/Locales/en_US.json         |  1 +
 .../UI/Views/Settings/SettingsCPUView.axaml   | 47 ++++++++++++++++++-
 .../Views/Settings/SettingsSystemView.axaml   | 34 --------------
 src/Ryujinx/UI/Windows/MainWindow.axaml.cs    | 10 ++--
 4 files changed, 53 insertions(+), 39 deletions(-)

diff --git a/src/Ryujinx/Assets/Locales/en_US.json b/src/Ryujinx/Assets/Locales/en_US.json
index d5adf474c..34bdb8083 100644
--- a/src/Ryujinx/Assets/Locales/en_US.json
+++ b/src/Ryujinx/Assets/Locales/en_US.json
@@ -523,6 +523,7 @@
   "SettingsTabNetworkConnection": "Network Connection",
   "SettingsTabCpuCache": "CPU Cache",
   "SettingsTabCpuMemory": "CPU Mode",
+  "SettingsTabCpuHacks": "Hacks",
   "DialogUpdaterFlatpakNotSupportedMessage": "Please update Ryujinx via FlatHub.",
   "UpdaterDisabledWarningTitle": "Updater Disabled!",
   "ControllerSettingsRotate90": "Rotate 90° Clockwise",
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
index c74d3dd57..67bd687c5 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsCPUView.axaml
@@ -1,10 +1,11 @@
-<UserControl
+<UserControl
     x:Class="Ryujinx.Ava.UI.Views.Settings.SettingsCPUView"
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
+    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     mc:Ignorable="d"
     x:DataType="viewModels:SettingsViewModel">
@@ -71,6 +72,50 @@
                                    ToolTip.Tip="{locale:Locale UseHypervisorTooltip}" />
                     </CheckBox>
                 </StackPanel>
+
+                <StackPanel
+                    Orientation="Vertical"
+                    Spacing="2">
+                    <TextBlock
+                        Classes="h1"
+                        Text="{locale:Locale SettingsTabCpuHacks}" />
+                    <TextBlock
+                        Foreground="{DynamicResource SecondaryTextColor}"
+                        Text="{locale:Locale SettingsTabSystemHacksNote}" />
+                </StackPanel>
+                <StackPanel Margin="0,0,0,10"
+                            Orientation="Horizontal">
+                    <TextBlock
+                        VerticalAlignment="Center"
+                        Text="{locale:Locale SettingsTabSystemTurboMultiplierValue}"
+                        ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueTooltip}"
+                        Width="250" />
+                    <ui:NumberBox ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueTooltip}"
+                                  Value="{Binding TurboMultiplier}"
+                                  Width="165"
+                                  SmallChange="1.0"
+                                  LargeChange="10"
+                                  SimpleNumberFormat="F0"
+                                  SpinButtonPlacementMode="Hidden"
+                                  Minimum="50"
+                                  Maximum="500" />
+                    <Slider Value="{Binding TurboMultiplier}"
+                            ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierSliderTooltip}"
+                            MinWidth="175"
+                            Margin="10,-3,0,0"
+                            Height="32"
+                            Padding="0,-5"
+                            TickFrequency="1"
+                            IsSnapToTickEnabled="True"
+                            LargeChange="10"
+                            SmallChange="1"
+                            VerticalAlignment="Center"
+                            Minimum="50"
+                            Maximum="500" />
+                    <TextBlock Margin="5,0"
+                               Width="40"
+                               Text="{Binding TurboMultiplierPercentageText}"/>
+                </StackPanel>
             </StackPanel>
         </Border>
     </ScrollViewer>
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
index 96d49b78a..e8cab19f4 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsSystemView.axaml
@@ -4,7 +4,6 @@
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
     xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
     xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
-    xmlns:ui="clr-namespace:FluentAvalonia.UI.Controls;assembly=FluentAvalonia"
     xmlns:locale="clr-namespace:Ryujinx.Ava.Common.Locale"
     xmlns:viewModels="clr-namespace:Ryujinx.Ava.UI.ViewModels"
     xmlns:helpers="clr-namespace:Ryujinx.Ava.UI.Helpers"
@@ -219,39 +218,6 @@
                         <TextBlock Text="{locale:Locale SettingsTabSystemIgnoreMissingServices}" />
                     </CheckBox>
                 </StackPanel>
-                <StackPanel Margin="0,0,0,10"
-                            Orientation="Horizontal">
-                    <TextBlock
-                        VerticalAlignment="Center"
-                        Text="{locale:Locale SettingsTabSystemTurboMultiplierValue}"
-                        ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueTooltip}"
-                        Width="250" />
-                    <ui:NumberBox ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierValueTooltip}"
-                                  Value="{Binding TurboMultiplier}"
-                                  Width="165"
-                                  SmallChange="1.0"
-                                  LargeChange="10"
-                                  SimpleNumberFormat="F0"
-                                  SpinButtonPlacementMode="Hidden"
-                                  Minimum="50"
-                                  Maximum="500" />
-                    <Slider Value="{Binding TurboMultiplier}"
-                            ToolTip.Tip="{locale:Locale SettingsTabSystemTurboMultiplierSliderTooltip}"
-                            MinWidth="175"
-                            Margin="10,-3,0,0"
-                            Height="32"
-                            Padding="0,-5"
-                            TickFrequency="1"
-                            IsSnapToTickEnabled="True"
-                            LargeChange="10"
-                            SmallChange="1"
-                            VerticalAlignment="Center"
-                            Minimum="50"
-                            Maximum="500" />
-                    <TextBlock Margin="5,0"
-                               Width="40"
-                               Text="{Binding TurboMultiplierPercentageText}"/>
-                </StackPanel>
             </StackPanel>
         </Border>
     </ScrollViewer>
diff --git a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
index ac77f02ef..233de61f0 100644
--- a/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
+++ b/src/Ryujinx/UI/Windows/MainWindow.axaml.cs
@@ -11,7 +11,6 @@ using Ryujinx.Ava.UI.Applet;
 using Ryujinx.Ava.UI.Helpers;
 using Ryujinx.Ava.UI.ViewModels;
 using Ryujinx.Common.Logging;
-using Ryujinx.Cpu;
 using Ryujinx.Graphics.Gpu;
 using Ryujinx.HLE.FileSystem;
 using Ryujinx.HLE.HOS;
@@ -410,10 +409,13 @@ namespace Ryujinx.Ava.UI.Windows
 
         public static void UpdateTurboConfig(long turboMultiplier)
         {
-            MainWindow.MainWindowViewModel.AppHost.Device.Configuration.TurboMultiplier = turboMultiplier;
-            if (MainWindow.MainWindowViewModel.AppHost.Device.TurboMode)
+            if (MainWindow.MainWindowViewModel.IsGameRunning)
             {
-                TickSource.s_tickMultiplier = turboMultiplier;
+                MainWindow.MainWindowViewModel.AppHost.Device.Configuration.TurboMultiplier = turboMultiplier;
+                if (MainWindow.MainWindowViewModel.AppHost.Device.TurboMode)
+                {
+                    MainWindow.MainWindowViewModel.AppHost.Device.SetTickSourceMultiplier(turboMultiplier);
+                }
             }
         }