sigonasr2/AdventuresInLestoria
1
1
Fork 0
Code Issues 11 Pull Requests Projects 1 Releases Wiki Activity

Fix right-hand side checkbox labels in Settings menu being too wide, going behind the scrollbar. Release Build 8208.

Browse Source
This commit is contained in:
sigonasr2 2024-03-20 02:09:06 -05:00
parent f73cadcbff
commit 7a683fffa6
4 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
Adventures in Lestoria/SettingsWindow.cpp
View File

@ -132,12 +132,12 @@ void Menu::InitializeSettingsWindow(){
GameSettings::SetTerrainCollisionBoxes(data.checked); GameSettings::SetTerrainCollisionBoxes(data.checked);
return true; return true;
},true)END; },true)END;
settingsList->ADD("Terrain Collision Boxes Label",MenuLabel)(geom2d::rect<float>{{windowSize.x/2+22.f,60},{windowSize.x/2-24.f,16.f}},"Terrain Collision Boxes",1.f,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END; settingsList->ADD("Terrain Collision Boxes Label",MenuLabel)(geom2d::rect<float>{{windowSize.x/2+22.f,60},{windowSize.x/2-36.f,16.f}},"Terrain Collision Boxes",1.f,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END;
settingsList->ADD("Keyboard Play Auto-Aim Checkbox",Checkbox)(geom2d::rect<float>{{windowSize.x/2+4.f,80},{16.f,16.f}},[](ToggleFuncData data){ settingsList->ADD("Keyboard Play Auto-Aim Checkbox",Checkbox)(geom2d::rect<float>{{windowSize.x/2+4.f,80},{16.f,16.f}},[](ToggleFuncData data){
GameSettings::SetKeyboardAutoAim(data.checked); GameSettings::SetKeyboardAutoAim(data.checked);
return true; return true;
},false)END; },false)END;
settingsList->ADD("Keyboard Play Auto-Aim Label",MenuLabel)(geom2d::rect<float>{{windowSize.x/2+22.f,80},{windowSize.x/2-24.f,16.f}},"Aim Assist\n(No Mouse Players)",1.f,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END; settingsList->ADD("Keyboard Play Auto-Aim Label",MenuLabel)(geom2d::rect<float>{{windowSize.x/2+22.f,80},{windowSize.x/2-36.f,16.f}},"Aim Assist\n(No Mouse Players)",1.f,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END;
auto fullscreenToggle=settingsList->ADD("Fullscreen Toggle Checkbox",Checkbox)(geom2d::rect<float>{{windowSize.x/2+4.f,100},{16.f,16.f}},[](ToggleFuncData data){ auto fullscreenToggle=settingsList->ADD("Fullscreen Toggle Checkbox",Checkbox)(geom2d::rect<float>{{windowSize.x/2+4.f,100},{16.f,16.f}},[](ToggleFuncData data){
if(data.checked){ //When going to fullscreen mode, the windowed mode positioning needs to be saved to be restored later. if(data.checked){ //When going to fullscreen mode, the windowed mode positioning needs to be saved to be restored later.
@ -149,7 +149,7 @@ void Menu::InitializeSettingsWindow(){
game->SetFullscreen(data.checked,GameSettings::GetWindowPos()); game->SetFullscreen(data.checked,GameSettings::GetWindowPos());
return true; return true;
},game->IsFullscreen())END; },game->IsFullscreen())END;
auto fullscreenToggleLabel=settingsList->ADD("Fullscreen Toggle Label",MenuLabel)(geom2d::rect<float>{{windowSize.x/2+22.f,100},{windowSize.x/2-24.f,16.f}},"Fullscreen",1.f,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END; auto fullscreenToggleLabel=settingsList->ADD("Fullscreen Toggle Label",MenuLabel)(geom2d::rect<float>{{windowSize.x/2+22.f,100},{windowSize.x/2-36.f,16.f}},"Fullscreen",1.f,ComponentAttr::SHADOW|ComponentAttr::LEFT_ALIGN)END;
#ifdef __EMSCRIPTEN__ #ifdef __EMSCRIPTEN__
fullscreenToggle->Disable(); fullscreenToggle->Disable();
fullscreenToggleLabel->Disable(); fullscreenToggleLabel->Disable();

1
Adventures in Lestoria/TODO.txt
View File

@ -17,4 +17,3 @@ Add in vsync system option
Hint text does not appear except during actual gameplay. Hint text does not appear except during actual gameplay.
Terrain Collision Boxes Terrain Collision Boxes
Add hotkeys to loadout slots when selecting them from the menu

2
Adventures in Lestoria/Version.h
View File

@ -39,7 +39,7 @@ All rights reserved.
#define VERSION_MAJOR 0 #define VERSION_MAJOR 0
#define VERSION_MINOR 5 #define VERSION_MINOR 5
#define VERSION_PATCH 1 #define VERSION_PATCH 1
#define VERSION_BUILD 8207 #define VERSION_BUILD 8208
#define stringify(a) stringify_(a) #define stringify(a) stringify_(a)
#define stringify_(a) #a #define stringify_(a) #a

BIN
x64/Release/Adventures in Lestoria.exe
View File

Binary file not shown.