From 88e1988d96dbb47d25c7e341d2e4d65c5540e58c Mon Sep 17 00:00:00 2001 From: furo Date: Sun, 8 Oct 2023 12:26:03 +0200 Subject: [PATCH] Move "Regular background color" setting to background Fixed capitalization (only captialize first letter) --- src/game/client/components/menus_settings.cpp | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 7c42a1def..099476a16 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -3136,9 +3136,13 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView) Background.HSplitTop(5.0f, nullptr, &Background); UI()->DoLabel(&Label, Localize("Background"), 20.0f, TEXTALIGN_ML); - static CButtonContainer s_ResetID2; ColorRGBA GreyDefault(0.5f, 0.5f, 0.5f, 1); - DoLine_ColorPicker(&s_ResetID2, 25.0f, 13.0f, 5.0f, &Background, Localize("Entities Background color"), &g_Config.m_ClBackgroundEntitiesColor, GreyDefault, false); + + static CButtonContainer s_ResetID1; + DoLine_ColorPicker(&s_ResetID1, 25.0f, 13.0f, 5.0f, &Background, Localize("Regular background color"), &g_Config.m_ClBackgroundColor, GreyDefault, false); + + static CButtonContainer s_ResetID2; + DoLine_ColorPicker(&s_ResetID2, 25.0f, 13.0f, 5.0f, &Background, Localize("Entities background color"), &g_Config.m_ClBackgroundEntitiesColor, GreyDefault, false); CUIRect EditBox; Background.HSplitTop(20.0f, &Label, &Background); @@ -3181,12 +3185,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView) UI()->DoLabel(&Label, Localize("Miscellaneous"), 20.0f, TEXTALIGN_ML); - static CButtonContainer s_ResetID1; - Miscellaneous.HSplitTop(25.0f, &Button, &Miscellaneous); - DoLine_ColorPicker(&s_ResetID1, 25.0f, 13.0f, 5.0f, &Button, Localize("Regular Background Color"), &g_Config.m_ClBackgroundColor, GreyDefault, false); - static CButtonContainer s_ButtonTimeout; - Miscellaneous.HSplitTop(10.0f, nullptr, &Miscellaneous); Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous); if(DoButton_Menu(&s_ButtonTimeout, Localize("New random timeout code"), 0, &Button)) {