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

Merge pull request #8799 from Robyt3/Client-Menu-Ingame-Margin-Fix

Browse source 
Fix inconsistent margin in ingame menu, minor refactoring
This commit is contained in:
Dennis Felsing 2024-08-24 11:26:18 +00:00 committed by GitHub
parent 3cf3e2339d 93675799e8
commit e9a9261d1e
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 14 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
src/game/client/components/menus_ingame.cpp
View file

@ -69,7 +69,7 @@ void CMenus::RenderGame(CUIRect MainView)
} }
} }
ButtonBar.VSplitRight(5.0f, &ButtonBar, 0); ButtonBar.VSplitRight(5.0f, &ButtonBar, nullptr);
ButtonBar.VSplitRight(170.0f, &ButtonBar, &Button); ButtonBar.VSplitRight(170.0f, &ButtonBar, &Button);
static CButtonContainer s_DummyButton; static CButtonContainer s_DummyButton;
@ -107,9 +107,8 @@ void CMenus::RenderGame(CUIRect MainView)
} }
} }
ButtonBar.VSplitRight(5.0f, &ButtonBar, 0); ButtonBar.VSplitRight(5.0f, &ButtonBar, nullptr);
ButtonBar.VSplitRight(140.0f, &ButtonBar, &Button); ButtonBar.VSplitRight(140.0f, &ButtonBar, &Button);
static CButtonContainer s_DemoButton; static CButtonContainer s_DemoButton;
const bool Recording = DemoRecorder(RECORDER_MANUAL)->IsRecording(); const bool Recording = DemoRecorder(RECORDER_MANUAL)->IsRecording();
if(DoButton_Menu(&s_DemoButton, Recording ? Localize("Stop record") : Localize("Record demo"), 0, &Button)) if(DoButton_Menu(&s_DemoButton, Recording ? Localize("Stop record") : Localize("Record demo"), 0, &Button))
@ -130,12 +129,11 @@ void CMenus::RenderGame(CUIRect MainView)
if(m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && !Paused && !Spec) if(m_pClient->m_Snap.m_pLocalInfo && m_pClient->m_Snap.m_pGameInfoObj && !Paused && !Spec)
{ {
static CButtonContainer s_SpectateButton;
if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS) if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS)
{ {
ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
static CButtonContainer s_SpectateButton;
if(!Client()->DummyConnecting() && DoButton_Menu(&s_SpectateButton, Localize("Spectate"), 0, &Button)) if(!Client()->DummyConnecting() && DoButton_Menu(&s_SpectateButton, Localize("Spectate"), 0, &Button))
{ {
if(g_Config.m_ClDummy == 0 || Client()->DummyConnected()) if(g_Config.m_ClDummy == 0 || Client()->DummyConnected())
@ -150,8 +148,8 @@ void CMenus::RenderGame(CUIRect MainView)
{ {
if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED) if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED)
{ {
ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
static CButtonContainer s_JoinRedButton; static CButtonContainer s_JoinRedButton;
if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinRedButton, Localize("Join red"), 0, &Button)) if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinRedButton, Localize("Join red"), 0, &Button))
{ {
@ -162,8 +160,8 @@ void CMenus::RenderGame(CUIRect MainView)
if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_BLUE) if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_BLUE)
{ {
ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
static CButtonContainer s_JoinBlueButton; static CButtonContainer s_JoinBlueButton;
if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinBlueButton, Localize("Join blue"), 0, &Button)) if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinBlueButton, Localize("Join blue"), 0, &Button))
{ {
@ -174,13 +172,14 @@ void CMenus::RenderGame(CUIRect MainView)
} }
else else
{ {
if(m_pClient->m_Snap.m_pLocalInfo->m_Team != 0) if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_RED)
{ {
ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft(120.0f, &Button, &ButtonBar);
if(!Client()->DummyConnecting() && DoButton_Menu(&s_SpectateButton, Localize("Join game"), 0, &Button)) ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
static CButtonContainer s_JoinGameButton;
if(!Client()->DummyConnecting() && DoButton_Menu(&s_JoinGameButton, Localize("Join game"), 0, &Button))
{ {
m_pClient->SendSwitchTeam(0); m_pClient->SendSwitchTeam(TEAM_RED);
SetActive(false); SetActive(false);
} }
} }
@ -188,8 +187,8 @@ void CMenus::RenderGame(CUIRect MainView)
if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS && (ShowDDRaceButtons || !(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS))) if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS && (ShowDDRaceButtons || !(m_pClient->m_Snap.m_pGameInfoObj->m_GameFlags & GAMEFLAG_TEAMS)))
{ {
ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft(65.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft(65.0f, &Button, &ButtonBar);
ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
static CButtonContainer s_KillButton; static CButtonContainer s_KillButton;
if(DoButton_Menu(&s_KillButton, Localize("Kill"), 0, &Button)) if(DoButton_Menu(&s_KillButton, Localize("Kill"), 0, &Button))
@ -204,13 +203,13 @@ void CMenus::RenderGame(CUIRect MainView)
{ {
if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS || Paused || Spec) if(m_pClient->m_Snap.m_pLocalInfo->m_Team != TEAM_SPECTATORS || Paused || Spec)
{ {
ButtonBar.VSplitLeft(5.0f, 0, &ButtonBar);
ButtonBar.VSplitLeft((!Paused && !Spec) ? 65.0f : 120.0f, &Button, &ButtonBar); ButtonBar.VSplitLeft((!Paused && !Spec) ? 65.0f : 120.0f, &Button, &ButtonBar);
ButtonBar.VSplitLeft(5.0f, nullptr, &ButtonBar);
static CButtonContainer s_PauseButton; static CButtonContainer s_PauseButton;
if(DoButton_Menu(&s_PauseButton, (!Paused && !Spec) ? Localize("Pause") : Localize("Join game"), 0, &Button)) if(DoButton_Menu(&s_PauseButton, (!Paused && !Spec) ? Localize("Pause") : Localize("Join game"), 0, &Button))
{ {
m_pClient->Console()->ExecuteLine("say /pause"); Console()->ExecuteLine("say /pause");
SetActive(false); SetActive(false);
} }
} }