Merge pull request #1778 from Dune-jr/fix-buttonorder

Move 'Show user IDs' option up to keep consistency
This commit is contained in:
oy 2018-12-06 20:52:20 +01:00 committed by GitHub
commit c0bf3f6fa6
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23

View file

@ -991,18 +991,18 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView)
if(DoButton_CheckBox(&s_Showhud, Localize("Show ingame HUD"), g_Config.m_ClShowhud, &Button))
g_Config.m_ClShowhud ^= 1;
GameRight.HSplitTop(Spacing, 0, &GameRight);
GameRight.HSplitTop(ButtonHeight, &Button, &GameRight);
static int s_Showsocial = 0;
if(DoButton_CheckBox(&s_Showsocial, Localize("Show social"), g_Config.m_ClShowsocial, &Button))
g_Config.m_ClShowsocial ^= 1;
GameRight.HSplitTop(Spacing, 0, &GameRight);
GameRight.HSplitTop(ButtonHeight, &Button, &GameRight);
static int s_ShowUserId = 0;
if(DoButton_CheckBox(&s_ShowUserId, Localize("Show user IDs"), g_Config.m_ClShowUserId, &Button))
g_Config.m_ClShowUserId ^= 1;
GameRight.HSplitTop(Spacing, 0, &GameRight);
GameRight.HSplitTop(ButtonHeight, &Button, &GameRight);
static int s_Showsocial = 0;
if(DoButton_CheckBox(&s_Showsocial, Localize("Show social"), g_Config.m_ClShowsocial, &Button))
g_Config.m_ClShowsocial ^= 1;
// show chat messages button
if(g_Config.m_ClShowsocial)
{