edg-l/ddnet
1
0
Fork 0
mirror of https://github.com/ddnet/ddnet.git synced 2024-11-20 06:58:20 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #7323 from furo321/move-background-setting

Browse source 
Move "Regular background color" setting to background
This commit is contained in:
Dennis Felsing 2023-10-08 10:59:34 +00:00 committed by GitHub
parent d4fed2360e 88e1988d96
commit dc57cc38c4
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 6 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
src/game/client/components/menus_settings.cpp
View file

@ -3139,9 +3139,13 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
Background.HSplitTop(5.0f, nullptr, &Background); Background.HSplitTop(5.0f, nullptr, &Background);
UI()->DoLabel(&Label, Localize("Background"), 20.0f, TEXTALIGN_ML); UI()->DoLabel(&Label, Localize("Background"), 20.0f, TEXTALIGN_ML);
static CButtonContainer s_ResetID2;
ColorRGBA GreyDefault(0.5f, 0.5f, 0.5f, 1); 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; CUIRect EditBox;
Background.HSplitTop(20.0f, &Label, &Background); Background.HSplitTop(20.0f, &Label, &Background);
@ -3184,12 +3188,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
UI()->DoLabel(&Label, Localize("Miscellaneous"), 20.0f, TEXTALIGN_ML); 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; static CButtonContainer s_ButtonTimeout;
Miscellaneous.HSplitTop(10.0f, nullptr, &Miscellaneous);
Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous); Miscellaneous.HSplitTop(20.0f, &Button, &Miscellaneous);
if(DoButton_Menu(&s_ButtonTimeout, Localize("New random timeout code"), 0, &Button)) if(DoButton_Menu(&s_ButtonTimeout, Localize("New random timeout code"), 0, &Button))
{ {