From dc3500e11056a2de7ef7b8942bb893e0b4cdada7 Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Tue, 25 Jul 2023 17:28:33 +0100
Subject: [PATCH] Don't force DPI scaling fixes

---
 Bloxstrap/FastFlagManager.cs                  |  7 +------
 .../UI/Elements/Menu/Pages/FastFlagsPage.xaml | 20 +++++++++++++++++++
 .../UI/ViewModels/Menu/FastFlagsViewModel.cs  |  6 ++++++
 Bloxstrap/Updater.cs                          |  9 +++++++++
 4 files changed, 36 insertions(+), 6 deletions(-)

diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
index 404528d..618ba32 100644
--- a/Bloxstrap/FastFlagManager.cs
+++ b/Bloxstrap/FastFlagManager.cs
@@ -22,9 +22,7 @@ namespace Bloxstrap
             { "Rendering.Framerate", "DFIntTaskSchedulerTargetFps" },
             { "Rendering.Fullscreen", "FFlagHandleAltEnterFullscreenManually" },
             { "Rendering.TexturePack", "FStringPartTexturePackTable2022" },
-
-            { "Rendering.DPI.Disable", "DFFlagDisableDPIScale" },
-            { "Rendering.DPI.Variable", "DFFlagVariableDPIScale2" },
+            { "Rendering.DisableScaling", "DFFlagDisableDPIScale" },
 
             { "Rendering.Mode.D3D11", "FFlagDebugGraphicsPreferD3D11" },
             { "Rendering.Mode.D3D10", "FFlagDebugGraphicsPreferD3D11FL10" },
@@ -191,9 +189,6 @@ namespace Bloxstrap
 
             SetPresetOnce("Rendering.Framerate", 9999);
             SetPresetOnce("Rendering.Fullscreen", "False");
-
-            SetPresetOnce("Rendering.DPI.Disable", "True");
-            SetPresetOnce("Rendering.DPI.Variable", "False");
         }
     }
 }
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
index 31eae9d..111c071 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
@@ -173,6 +173,26 @@
       </ui:CardControl.Header>
       <ComboBox Margin="5,0,0,0" Padding="10,5,10,5" Width="200" ItemsSource="{Binding RenderingModes.Keys, Mode=OneTime}" Text="{Binding SelectedRenderingMode, Mode=TwoWay}" />
     </ui:CardControl>
+    <ui:CardControl Margin="0,8,0,0">
+      <ui:CardControl.Header>
+        <StackPanel>
+          <Grid>
+            <Grid.ColumnDefinitions>
+              <ColumnDefinition Width="Auto" />
+              <ColumnDefinition Width="Auto" />
+            </Grid.ColumnDefinitions>
+            <TextBlock Grid.Column="0" FontSize="14" Text="Preserve rendering quality with display scaling" />
+            <TextBlock Grid.Column="1" Margin="4,0,0,0">
+              <Hyperlink TextDecorations="None" ToolTip="More information on this preset" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/A-guide-to-FastFlags#dpi-scaling-fixes">
+                <ui:SymbolIcon Symbol="QuestionCircle48" Margin="0,1,0,0" />
+              </Hyperlink>
+            </TextBlock>
+          </Grid>
+          <TextBlock Margin="0,2,0,0" FontSize="12" Text="Roblox reduces your rendering quality, depending on display scaling. This toggle disables that." Foreground="{DynamicResource TextFillColorTertiaryBrush}" />
+        </StackPanel>
+      </ui:CardControl.Header>
+      <ui:ToggleSwitch IsChecked="{Binding FixDisplayScaling, Mode=TwoWay}" />
+    </ui:CardControl>
     <ui:CardControl Margin="0,8,0,0">
       <ui:CardControl.Header>
         <StackPanel>
diff --git a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
index 3412a30..3859260 100644
--- a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
@@ -66,6 +66,12 @@ namespace Bloxstrap.UI.ViewModels.Menu
             set => App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
         }
 
+        public bool FixDisplayScaling
+        {
+            get => App.FastFlags.GetPreset("Rendering.DisableScaling") == "True";
+            set => App.FastFlags.SetPreset("Rendering.DisableScaling", value ? "True" : null);
+        }
+
         public bool AlternateGraphicsSelectorEnabled
         {
             get => App.FastFlags.GetPreset("UI.Menu.GraphicsSlider") == "True";
diff --git a/Bloxstrap/Updater.cs b/Bloxstrap/Updater.cs
index 4e091e9..e1fb8e7 100644
--- a/Bloxstrap/Updater.cs
+++ b/Bloxstrap/Updater.cs
@@ -67,6 +67,15 @@ namespace Bloxstrap
 
             Bootstrapper.Register();
 
+            // update migrations
+
+            if (App.BuildMetadata.CommitRef.StartsWith("tag") && App.Version == "2.4.1")
+            {
+                App.FastFlags.SetValue("DFFlagDisableDPIScale", null);
+                App.FastFlags.SetValue("DFFlagVariableDPIScale2", null);
+                App.FastFlags.Save();
+            }
+
             if (isAutoUpgrade)
             {
                 App.NotifyIcon?.ShowAlert(