Don't set manual fullscreen flag for Vulkan/OpenGL

This commit is contained in:
pizzaboxer 2023-07-25 23:36:15 +01:00
parent d9d7622f7b
commit 5de6d02922
No known key found for this signature in database
GPG Key ID: 59D4A1DBAD0F2BA8
3 changed files with 17 additions and 7 deletions

View File

@ -20,7 +20,7 @@ namespace Bloxstrap
{ "HTTP.Proxy.Address.3", "DFStringHttpCurlProxyHostAndPortForExternalUrl" }, { "HTTP.Proxy.Address.3", "DFStringHttpCurlProxyHostAndPortForExternalUrl" },
{ "Rendering.Framerate", "DFIntTaskSchedulerTargetFps" }, { "Rendering.Framerate", "DFIntTaskSchedulerTargetFps" },
{ "Rendering.Fullscreen", "FFlagHandleAltEnterFullscreenManually" }, { "Rendering.ManualFullscreen", "FFlagHandleAltEnterFullscreenManually" },
{ "Rendering.TexturePack", "FStringPartTexturePackTable2022" }, { "Rendering.TexturePack", "FStringPartTexturePackTable2022" },
{ "Rendering.DisableScaling", "DFFlagDisableDPIScale" }, { "Rendering.DisableScaling", "DFFlagDisableDPIScale" },
@ -175,6 +175,14 @@ namespace Bloxstrap
return mapping.First().Key; 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() public override void Save()
{ {
// convert all flag values to strings before saving // convert all flag values to strings before saving
@ -190,7 +198,7 @@ namespace Bloxstrap
base.Load(); base.Load();
SetPresetOnce("Rendering.Framerate", 9999); SetPresetOnce("Rendering.Framerate", 9999);
SetPresetOnce("Rendering.Fullscreen", "False"); CheckManualFullscreenPreset();
} }
} }
} }

View File

@ -67,11 +67,9 @@
<TextBlock Text="Presets" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" /> <TextBlock Text="Presets" FontSize="16" FontWeight="Medium" Margin="0,16,0,0" />
<TextBlock Foreground="{DynamicResource TextFillColorSecondaryBrush}"> <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> <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 using Alt+Enter is already enabled by default.
<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.
</TextBlock> </TextBlock>
<ui:CardControl Margin="0,8,0,0"> <ui:CardControl Margin="0,8,0,0">
<ui:CardControl.Header> <ui:CardControl.Header>

View File

@ -63,7 +63,11 @@ namespace Bloxstrap.UI.ViewModels.Menu
public string SelectedRenderingMode public string SelectedRenderingMode
{ {
get => App.FastFlags.GetPresetEnum(RenderingModes, "Rendering.Mode", "True"); 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 public bool FixDisplayScaling