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

Merge #1927

Browse source 
1927: Add show text entities button to settings r=Learath2 a=12pm

Fixes #1897

Co-authored-by: 12pm <30786226+12pm@users.noreply.github.com>
This commit is contained in:
bors[bot] 2019-10-02 22:02:12 +00:00 committed by GitHub
parent e7ea336a94 bc62167131
commit 80efc085f6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 17 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -2078,6 +2078,22 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
g_Config.m_ClOverlayEntities = (int)(DoScrollbarH(&g_Config.m_ClOverlayEntities, &Button, g_Config.m_ClOverlayEntities/100.0f)*100.0f); g_Config.m_ClOverlayEntities = (int)(DoScrollbarH(&g_Config.m_ClOverlayEntities, &Button, g_Config.m_ClOverlayEntities/100.0f)*100.0f);
} }
{
CUIRect Button, Label;
Left.HSplitTop(20.0f, &Button, &Left);
Button.VSplitMid(&LeftLeft, &Button);
Button.VSplitLeft(50.0f, &Label, &Button);
Button.HMargin(2.0f, &Button);
UI()->DoLabelScaled(&Label, Localize("Size"), 14.0f, -1);
g_Config.m_ClTextEntitiesSize = (int)(DoScrollbarH(&g_Config.m_ClTextEntitiesSize, &Button, g_Config.m_ClTextEntitiesSize/100.0f)*100.0f);
if(DoButton_CheckBox(&g_Config.m_ClTextEntities, Localize("Show text entities"), g_Config.m_ClTextEntities, &LeftLeft))
{
g_Config.m_ClTextEntities ^= 1;
}
}
{ {
CUIRect Button, Label; CUIRect Button, Label;
Left.HSplitTop(20.0f, &Button, &Left); Left.HSplitTop(20.0f, &Button, &Left);
@ -2172,7 +2188,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
CUIRect aRects[2]; CUIRect aRects[2];
Left.HSplitTop(5.0f, &Button, &Left); Left.HSplitTop(5.0f, &Button, &Left);
Right.HSplitTop(5.0f, &Button, &Right); Right.HSplitTop(25.0f, &Button, &Right);
aRects[0] = Left; aRects[0] = Left;
aRects[1] = Right; aRects[1] = Right;
aRects[0].VSplitRight(10.0f, &aRects[0], 0); aRects[0].VSplitRight(10.0f, &aRects[0], 0);