From 5de6d029225d64ed9e457c40a3e7d0589edfe75b Mon Sep 17 00:00:00 2001
From: pizzaboxer <pizzaboxer@pizzaboxer.xyz>
Date: Tue, 25 Jul 2023 23:36:15 +0100
Subject: [PATCH] Don't set manual fullscreen flag for Vulkan/OpenGL

---
 Bloxstrap/FastFlagManager.cs                        | 12 ++++++++++--
 Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml |  6 ++----
 Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs  |  6 +++++-
 3 files changed, 17 insertions(+), 7 deletions(-)

diff --git a/Bloxstrap/FastFlagManager.cs b/Bloxstrap/FastFlagManager.cs
index a5caa7d..421abbe 100644
--- a/Bloxstrap/FastFlagManager.cs
+++ b/Bloxstrap/FastFlagManager.cs
@@ -20,7 +20,7 @@ namespace Bloxstrap
             { "HTTP.Proxy.Address.3", "DFStringHttpCurlProxyHostAndPortForExternalUrl" },
 
             { "Rendering.Framerate", "DFIntTaskSchedulerTargetFps" },
-            { "Rendering.Fullscreen", "FFlagHandleAltEnterFullscreenManually" },
+            { "Rendering.ManualFullscreen", "FFlagHandleAltEnterFullscreenManually" },
             { "Rendering.TexturePack", "FStringPartTexturePackTable2022" },
             { "Rendering.DisableScaling", "DFFlagDisableDPIScale" },
 
@@ -175,6 +175,14 @@ namespace Bloxstrap
             return mapping.First().Key;
         }
 
+        public void CheckManualFullscreenPreset()
+        {
+            if (GetPreset("Rendering.Mode.Vulkan") == "True" || GetPreset("Rendering.Mode.OpenGL") == "True")
+                SetPreset("Rendering.ManualFullscreen", null);
+            else
+                SetPreset("Rendering.ManualFullscreen", "False");
+        }
+
         public override void Save()
         {
             // convert all flag values to strings before saving
@@ -190,7 +198,7 @@ namespace Bloxstrap
             base.Load();
 
             SetPresetOnce("Rendering.Framerate", 9999);
-            SetPresetOnce("Rendering.Fullscreen", "False");
+            CheckManualFullscreenPreset();
         }
     }
 }
diff --git a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
index 111c071..d1c1fdc 100644
--- a/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
+++ b/Bloxstrap/UI/Elements/Menu/Pages/FastFlagsPage.xaml
@@ -67,11 +67,9 @@
     
     <TextBlock Text="Presets" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
     <TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}">
-      FastFlags for Direct3D
+      FastFlag preset for Direct3D
       <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/A-guide-to-FastFlags#exclusive-fullscreen">exclusive fullscreen</Hyperlink>
-      (Alt+Enter) and
-      <Hyperlink Foreground="{DynamicResource TextFillColorPrimaryBrush}" Command="models:GlobalViewModel.OpenWebpageCommand" CommandParameter="https://github.com/pizzaboxer/bloxstrap/wiki/A-guide-to-FastFlags#dpi-scaling-fixes">DPI scaling fixes</Hyperlink>
-      are already enabled by default.
+      using Alt+Enter is already enabled by default.
     </TextBlock>
     <ui:CardControl Margin="0,8,0,0">
       <ui:CardControl.Header>
diff --git a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
index 3859260..8b95d0c 100644
--- a/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
+++ b/Bloxstrap/UI/ViewModels/Menu/FastFlagsViewModel.cs
@@ -63,7 +63,11 @@ namespace Bloxstrap.UI.ViewModels.Menu
         public string SelectedRenderingMode
         {
             get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True");
-            set => App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
+            set
+            {
+                App.FastFlags.SetPresetEnum("Rendering.Mode", RenderingModes[value], "True");
+                App.FastFlags.CheckManualFullscreenPreset();
+            }
         }
 
         public bool FixDisplayScaling