PowerControl: Retain FPS Limit (proportion) on refresh rate change

ayufan · Feb 8, 2023 · 5cd873b · 5cd873b
1 parent bc9c319
commit 5cd873b
Show file tree

Hide file tree

Showing 6 changed files with 58 additions and 24 deletions.
diff --git a/PowerControl/Menu/MenuItemWithOptions.cs b/PowerControl/Menu/MenuItemWithOptions.cs
@@ -16,6 +16,7 @@ public class MenuItemWithOptions : MenuItem
         public Func<string?>? CurrentValue { get; set; }
         public Func<string[]?>? OptionsValues { get; set; }
         public Func<string, string?>? ApplyValue { get; set; }
+        public Action<MenuItemWithOptions, string?, string>? ImpactedBy { get; set; }
         public Action? AfterApply { get; set; }
         public Func<string?>? ResetValue { get; set; }
 
@@ -114,17 +115,26 @@ private void FinalizeSet()
                     CommonHelpers.Log.TraceException("FinalizeSet", Name, e);
                     Update();
                 }
-
-                if (AfterApply != null && runAfterApply)
-                    AfterApply();
             }
             else
                 ActiveOption = SelectedOption;
 
             SelectedOption = null;
 
             if (wasOption != ActiveOption && ActiveOption != null)
+            {
+                if (AfterApply != null)
+                    AfterApply();
+
+                foreach (var impact in Impacts)
+                {
+                    if (impact.ImpactedBy is not null)
+                        impact.ImpactedBy(this, wasOption, ActiveOption);
+                    impact.Update();
+                }
+
                 ValueChanged(this, wasOption, ActiveOption);
+            }
         }
 
         public override void CreateMenu(System.Windows.Forms.ContextMenuStrip contextMenu)

diff --git a/PowerControl/Options/FPSLimit.cs b/PowerControl/Options/FPSLimit.cs
@@ -67,6 +67,50 @@ public static class FPSLimit
                     CommonHelpers.Log.TraceException("RTSS", e);
                 }
                 return null;
+            },
+            ImpactedBy = (option, was, isNow) =>
+            {
+                if (Instance is null)
+                    return;
+
+                try
+                {
+                    if (!Dependencies.EnsureRTSS(null))
+                        return;
+
+                    var refreshRate = DisplayResolutionController.GetRefreshRate();
+                    if (refreshRate <= 0)
+                        return;
+
+                    RTSS.LoadProfile();
+                    RTSS.GetProfileProperty("FramerateLimit", out int fpsLimit);
+                    if (fpsLimit == 0)
+                        return;
+
+                    // FPSLimit, RR => outcome
+                    // 50 + 60 => 60 (div 1)
+                    // 25 + 60 => 30 (div 2)
+                    // 10 + 60 => 15 (div 6)
+                    // 60 + 50 => 50 (div 0)
+                    // 50 + 40 => 40 (div 0)
+                    // 60 + 30 => 30 (div 0)
+                    int div = refreshRate / fpsLimit;
+                    if (div >= 4)
+                        fpsLimit = refreshRate / 4;
+                    else if (div >= 2)
+                        fpsLimit = refreshRate / 2;
+                    else
+                        fpsLimit = refreshRate;
+                    RTSS.SetProfileProperty("FramerateLimit", fpsLimit);
+                    RTSS.SaveProfile();
+                    RTSS.UpdateProfiles();
+                }
+                catch (Exception e)
+                {
+#if DEBUG
+                    CommonHelpers.Log.TraceException("RTSS", e);
+#endif
+                }
             }
         };
     }

diff --git a/PowerControl/Options/GPUScalingItem.cs b/PowerControl/Options/GPUScalingItem.cs
@@ -40,13 +40,6 @@ public static class GPUScalingItem
                 Resolution.Instance,
                 RefreshRate.Instance,
                 FPSLimit.Instance
-            },
-            AfterApply = () =>
-            {
-                Resolution.Instance.Update();
-                RefreshRate.Instance.Update();
-                FPSLimit.Instance.Reset();
-                FPSLimit.Instance.Update();
             }
         };
     }

diff --git a/PowerControl/Options/RefreshRate.cs b/PowerControl/Options/RefreshRate.cs
@@ -31,12 +31,6 @@ public static class RefreshRate
             Impacts =
             {
                 FPSLimit.Instance
-            },
-            AfterApply = () =>
-            {
-                // force reset and refresh of FPS limit
-                FPSLimit.Instance.Reset();
-                FPSLimit.Instance.Update();
             }
         };
     }

diff --git a/PowerControl/Options/Resolution.cs b/PowerControl/Options/Resolution.cs
@@ -39,14 +39,6 @@ public static class Resolution
             {
                 RefreshRate.Instance,
                 FPSLimit.Instance
-            },
-            AfterApply = () =>
-            {
-                // force refresh Refresh Rate
-                RefreshRate.Instance.Update();
-                // force reset and refresh of FPS limit
-                FPSLimit.Instance.Reset();
-                FPSLimit.Instance.Update();
             }
         };
     }

diff --git a/RELEASE.md b/RELEASE.md
@@ -9,6 +9,7 @@
 
 ## 0.6.x
 
+- PowerControl: Retain FPS Limit (proportion) on refresh rate change
 - PowerControl: Support RTSS in custom folder
 - SteamController: Fix Steam Big Picture detection for non-english
 - PowerControl: Allow user to configure selectable TDP, CPU and GPU from `PowerControl.dll.ini`