Fix right-hand side checkbox labels in Settings menu being too wide, going behind the scrollbar. Release Build 8208.
This commit is contained in:
		
							parent
							
								
									f73cadcbff
								
							
						
					
					
						commit
						7a683fffa6
					
				| @ -132,12 +132,12 @@ void Menu::InitializeSettingsWindow(){ | ||||
|         GameSettings::SetTerrainCollisionBoxes(data.checked); | ||||
|         return true; | ||||
|     },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){ | ||||
|         GameSettings::SetKeyboardAutoAim(data.checked); | ||||
|         return true; | ||||
|     },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){ | ||||
|         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()); | ||||
|         return true; | ||||
|     },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__ | ||||
|         fullscreenToggle->Disable(); | ||||
|         fullscreenToggleLabel->Disable(); | ||||
|  | ||||
| @ -16,5 +16,4 @@ Add in vsync system option | ||||
| 
 | ||||
| Hint text does not appear except during actual gameplay. | ||||
| 
 | ||||
| Terrain Collision Boxes | ||||
| Add hotkeys to loadout slots when selecting them from the menu | ||||
| Terrain Collision Boxes | ||||
| @ -39,7 +39,7 @@ All rights reserved. | ||||
| #define VERSION_MAJOR 0 | ||||
| #define VERSION_MINOR 5 | ||||
| #define VERSION_PATCH 1 | ||||
| #define VERSION_BUILD 8207 | ||||
| #define VERSION_BUILD 8208 | ||||
| 
 | ||||
| #define stringify(a) stringify_(a) | ||||
| #define stringify_(a) #a | ||||
|  | ||||
										
											Binary file not shown.
										
									
								
							
		Loading…
	
	
			
			x
			
			
		
	
		Reference in New Issue
	
	Block a user