github/Shipwright
1
0
Fork 0
mirror of https://github.com/HarbourMasters/Shipwright.git synced 2025-07-16 10:02:59 -07:00
Code Issues Projects Releases Packages Wiki Activity Actions

Change Fullscreen toggle into button (#5236)

Browse source
This commit is contained in:
Archez 2025-03-30 12:20:21 -04:00 • committed by GitHub
parent 554379fd70
commit 0e23adc237
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 2 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

4
soh/soh/OTRGlobals.cpp
View file

@ -1385,10 +1385,6 @@ extern "C" void Graph_StartFrame() {
break; break;
} }
#endif #endif
case KbScancode::LUS_KB_F11: {
CVarSetInteger(CVAR_SETTING("Fullscreen"), !CVarGetInteger(CVAR_SETTING("Fullscreen"), 0));
break;
}
case KbScancode::LUS_KB_TAB: { case KbScancode::LUS_KB_TAB: {
CVarSetInteger(CVAR_ENHANCEMENT("AltAssets"), !CVarGetInteger(CVAR_ENHANCEMENT("AltAssets"), 0)); CVarSetInteger(CVAR_ENHANCEMENT("AltAssets"), !CVarGetInteger(CVAR_ENHANCEMENT("AltAssets"), 0));
break; break;

5
soh/soh/SohGui/SohMenuSettings.cpp
View file

@ -231,10 +231,9 @@ void SohMenu::AddMenuSettings() {
path.sidebarName = "Graphics"; path.sidebarName = "Graphics";
AddSidebarEntry("Settings", "Graphics", 3); AddSidebarEntry("Settings", "Graphics", 3);
AddWidget(path, "Graphics Options", WIDGET_SEPARATOR_TEXT); AddWidget(path, "Graphics Options", WIDGET_SEPARATOR_TEXT);
AddWidget(path, "Toggle Fullscreen", WIDGET_CVAR_CHECKBOX) AddWidget(path, "Toggle Fullscreen", WIDGET_BUTTON)
.CVar(CVAR_SETTING("Fullscreen"))
.Callback([](WidgetInfo& info) { Ship::Context::GetInstance()->GetWindow()->ToggleFullscreen(); }) .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) AddWidget(path, "Internal Resolution", WIDGET_CVAR_SLIDER_FLOAT)
.CVar(CVAR_INTERNAL_RESOLUTION) .CVar(CVAR_INTERNAL_RESOLUTION)
.Callback([](WidgetInfo& info) { .Callback([](WidgetInfo& info) {