diff options
Diffstat (limited to 'src/game')
| -rw-r--r-- | src/game/client/components/menus.cpp | 12 | ||||
| -rw-r--r-- | src/game/client/components/menus_settings.cpp | 13 |
2 files changed, 15 insertions, 10 deletions
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index 8a72c425..76109161 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -96,14 +96,18 @@ int CMenus::DoButton_Icon(int ImageId, int SpriteId, const CUIRect *pRect) int CMenus::DoButton_Menu(const void *pID, const char *pText, int Checked, const CUIRect *pRect) { RenderTools()->DrawUIRect(pRect, vec4(1,1,1,0.5f)*ButtonColorMul(pID), CUI::CORNER_ALL, 5.0f); - UI()->DoLabel(pRect, pText, pRect->h*ms_FontmodHeight, 0); + CUIRect Temp; + pRect->HMargin(pRect->h>=20.0f?2.0f:1.0f, &Temp); + UI()->DoLabel(&Temp, pText, Temp.h*ms_FontmodHeight, 0); return UI()->DoButtonLogic(pID, pText, Checked, pRect); } void CMenus::DoButton_KeySelect(const void *pID, const char *pText, int Checked, const CUIRect *pRect) { RenderTools()->DrawUIRect(pRect, vec4(1,1,1,0.5f)*ButtonColorMul(pID), CUI::CORNER_ALL, 5.0f); - UI()->DoLabel(pRect, pText, pRect->h*ms_FontmodHeight, 0); + CUIRect Temp; + pRect->HMargin(1.0f, &Temp); + UI()->DoLabel(&Temp, pText, Temp.h*ms_FontmodHeight, 0); } int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, const CUIRect *pRect, int Corners) @@ -112,7 +116,9 @@ int CMenus::DoButton_MenuTab(const void *pID, const char *pText, int Checked, co RenderTools()->DrawUIRect(pRect, ms_ColorTabbarActive, Corners, 10.0f); else RenderTools()->DrawUIRect(pRect, ms_ColorTabbarInactive, Corners, 10.0f); - UI()->DoLabel(pRect, pText, pRect->h*ms_FontmodHeight, 0); + CUIRect Temp; + pRect->HMargin(2.0f, &Temp); + UI()->DoLabel(&Temp, pText, Temp.h*ms_FontmodHeight, 0); return UI()->DoButtonLogic(pID, pText, Checked, pRect); } diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 17105cc1..cca7779f 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -442,12 +442,12 @@ void CMenus::UiDoGetButtons(int Start, int Stop, CUIRect View) CKeyInfo &Key = gs_aKeys[i]; CUIRect Button, Label; View.HSplitTop(20.0f, &Button, &View); - Button.VSplitLeft(130.0f, &Label, &Button); + Button.VSplitLeft(135.0f, &Label, &Button); char aBuf[64]; str_format(aBuf, sizeof(aBuf), "%s:", (const char *)Key.m_Name); - UI()->DoLabelScaled(&Label, aBuf, 14.0f, -1); + UI()->DoLabelScaled(&Label, aBuf, 13.0f, -1); int OldId = Key.m_KeyId; int NewId = DoKeyReader((void *)&gs_aKeys[i].m_Name, &Button, OldId); if(NewId != OldId) @@ -497,7 +497,7 @@ void CMenus::RenderSettingsControls(CUIRect MainView) { CUIRect Button, Label; MovementSettings.HSplitTop(20.0f, &Button, &MovementSettings); - Button.VSplitLeft(130.0f, &Label, &Button); + Button.VSplitLeft(135.0f, &Label, &Button); UI()->DoLabel(&Label, Localize("Mouse sens."), 14.0f*UI()->Scale(), -1); Button.HMargin(2.0f, &Button); g_Config.m_InpMousesens = (int)(DoScrollbarH(&g_Config.m_InpMousesens, &Button, (g_Config.m_InpMousesens-5)/500.0f)*500.0f)+5; @@ -723,7 +723,7 @@ void CMenus::RenderSettingsGraphics(CUIRect MainView) void CMenus::RenderSettingsSound(CUIRect MainView) { CUIRect Button; - MainView.VSplitLeft(300.0f, &MainView, 0); + MainView.VSplitMid(&MainView, 0); static int s_SndEnable = g_Config.m_SndEnable; static int s_SndRate = g_Config.m_SndRate; @@ -747,8 +747,7 @@ void CMenus::RenderSettingsSound(CUIRect MainView) str_format(aBuf, sizeof(aBuf), "%d", g_Config.m_SndRate); MainView.HSplitTop(20.0f, &Button, &MainView); UI()->DoLabelScaled(&Button, Localize("Sample rate"), 14.0f, -1); - Button.VSplitLeft(110.0f, 0, &Button); - Button.VSplitLeft(180.0f, &Button, 0); + Button.VSplitLeft(190.0f, 0, &Button); static float Offset = 0.0f; DoEditBox(&g_Config.m_SndRate, &Button, aBuf, sizeof(aBuf), 14.0f, &Offset); int Before = g_Config.m_SndRate; @@ -763,7 +762,7 @@ void CMenus::RenderSettingsSound(CUIRect MainView) CUIRect Button, Label; MainView.HSplitTop(5.0f, &Button, &MainView); MainView.HSplitTop(20.0f, &Button, &MainView); - Button.VSplitLeft(110.0f, &Label, &Button); + Button.VSplitLeft(190.0f, &Label, &Button); Button.HMargin(2.0f, &Button); UI()->DoLabelScaled(&Label, Localize("Sound volume"), 14.0f, -1); g_Config.m_SndVolume = (int)(DoScrollbarH(&g_Config.m_SndVolume, &Button, g_Config.m_SndVolume/100.0f)*100.0f); |