about summary refs log tree commit diff
path: root/src/game
diff options
context:
space:
mode:
authoroy <Tom_Adams@web.de>2011-01-05 12:19:06 +0100
committeroy <Tom_Adams@web.de>2011-01-05 12:19:06 +0100
commit2992d9a6c679081841d1448dd628e1b6ba5b0d38 (patch)
treead20cdb4404fa181443f5fab208b3c5d51df9c8d /src/game
parent073044747b5a3f172e5b03ab58b373cdd645c087 (diff)
downloadzcatch-2992d9a6c679081841d1448dd628e1b6ba5b0d38.tar.gz
zcatch-2992d9a6c679081841d1448dd628e1b6ba5b0d38.zip
scale control settings as well
Diffstat (limited to 'src/game')
-rw-r--r--src/game/client/components/menus_settings.cpp7
1 files changed, 1 insertions, 6 deletions
diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp
index 16cfa141..a43a7057 100644
--- a/src/game/client/components/menus_settings.cpp
+++ b/src/game/client/components/menus_settings.cpp
@@ -364,9 +364,6 @@ void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View)
 
 void CMenus::RenderSettingsControls(CUIRect MainView)
 {
-	float oldScale = UI()->Scale();
-	UI()->SetScale(1.0);
-
 	// this is kinda slow, but whatever
 	for(int i = 0; i < g_KeyCount; i++)
 		gs_aKeys[i].m_KeyId = 0;
@@ -454,7 +451,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 	// misc settings
 	{
 		MiscSettings.HSplitTop(10.0f, 0, &MiscSettings);
-		MiscSettings.HSplitTop(MainView.h/2-5.0f/(UI()->Scale())-45.0f, &MiscSettings, &ResetButton);
+		MiscSettings.HSplitBottom(50.0f*UI()->Scale(), &MiscSettings, &ResetButton);
 		RenderTools()->DrawUIRect(&MiscSettings, vec4(1,1,1,0.25f), CUI::CORNER_ALL, 10.0f);
 		MiscSettings.Margin(10.0f, &MiscSettings);
 
@@ -469,8 +466,6 @@ void CMenus::RenderSettingsControls(CUIRect MainView)
 	static int s_DefaultButton = 0;
 	if(DoButton_Menu((void*)&s_DefaultButton, Localize("Reset to defaults"), 0, &ResetButton))
 		m_pClient->m_pBinds->SetDefaults();
-
-	UI()->SetScale(oldScale);
 }
 
 void CMenus::RenderSettingsGraphics(CUIRect MainView)