From 0e23adc237f37f8dc4aa3398f10c3b556fb83be1 Mon Sep 17 00:00:00 2001 From: Archez Date: Sun, 30 Mar 2025 12:20:21 -0400 Subject: [PATCH] Change Fullscreen toggle into button (#5236) --- soh/soh/OTRGlobals.cpp | 4 ---- soh/soh/SohGui/SohMenuSettings.cpp | 5 ++--- 2 files changed, 2 insertions(+), 7 deletions(-) diff --git a/soh/soh/OTRGlobals.cpp b/soh/soh/OTRGlobals.cpp index b4db2ae7f..2b1eec610 100644 --- a/soh/soh/OTRGlobals.cpp +++ b/soh/soh/OTRGlobals.cpp @@ -1385,10 +1385,6 @@ extern "C" void Graph_StartFrame() { break; } #endif - case KbScancode::LUS_KB_F11: { - CVarSetInteger(CVAR_SETTING("Fullscreen"), !CVarGetInteger(CVAR_SETTING("Fullscreen"), 0)); - break; - } case KbScancode::LUS_KB_TAB: { CVarSetInteger(CVAR_ENHANCEMENT("AltAssets"), !CVarGetInteger(CVAR_ENHANCEMENT("AltAssets"), 0)); break; diff --git a/soh/soh/SohGui/SohMenuSettings.cpp b/soh/soh/SohGui/SohMenuSettings.cpp index 8e3cc5e19..12db748d1 100644 --- a/soh/soh/SohGui/SohMenuSettings.cpp +++ b/soh/soh/SohGui/SohMenuSettings.cpp @@ -231,10 +231,9 @@ void SohMenu::AddMenuSettings() { path.sidebarName = "Graphics"; AddSidebarEntry("Settings", "Graphics", 3); AddWidget(path, "Graphics Options", WIDGET_SEPARATOR_TEXT); - AddWidget(path, "Toggle Fullscreen", WIDGET_CVAR_CHECKBOX) - .CVar(CVAR_SETTING("Fullscreen")) + AddWidget(path, "Toggle Fullscreen", WIDGET_BUTTON) .Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); }) - .Options(CheckboxOptions().Tooltip("Toggles Fullscreen On/Off.")); + .Options(ButtonOptions().Tooltip("Toggles Fullscreen On/Off.")); AddWidget(path, "Internal Resolution", WIDGET_CVAR_SLIDER_FLOAT) .CVar(CVAR_INTERNAL_RESOLUTION) .Callback([](WidgetInfo& info) {