mirror of
https://github.com/ddnet/ddnet.git
synced 2024-09-19 17:14:18 +00:00
Merge 56b9240594
into e0a95d14a6
This commit is contained in:
commit
5c52d44749
|
@ -160,8 +160,6 @@ class CGameConsole : public CComponent
|
||||||
static const ColorRGBA ms_SearchHighlightColor;
|
static const ColorRGBA ms_SearchHighlightColor;
|
||||||
static const ColorRGBA ms_SearchSelectedColor;
|
static const ColorRGBA ms_SearchSelectedColor;
|
||||||
|
|
||||||
void Toggle(int Type);
|
|
||||||
|
|
||||||
static void PossibleCommandsRenderCallback(int Index, const char *pStr, void *pUser);
|
static void PossibleCommandsRenderCallback(int Index, const char *pStr, void *pUser);
|
||||||
static void ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData);
|
static void ConToggleLocalConsole(IConsole::IResult *pResult, void *pUserData);
|
||||||
static void ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData);
|
static void ConToggleRemoteConsole(IConsole::IResult *pResult, void *pUserData);
|
||||||
|
@ -196,6 +194,7 @@ public:
|
||||||
virtual bool OnInput(const IInput::CEvent &Event) override;
|
virtual bool OnInput(const IInput::CEvent &Event) override;
|
||||||
void Prompt(char (&aPrompt)[32]);
|
void Prompt(char (&aPrompt)[32]);
|
||||||
|
|
||||||
|
void Toggle(int Type);
|
||||||
bool IsClosed() { return m_ConsoleState == CONSOLE_CLOSED; }
|
bool IsClosed() { return m_ConsoleState == CONSOLE_CLOSED; }
|
||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
|
@ -39,6 +39,14 @@ void CMenus::RenderStartMenu(CUIRect MainView)
|
||||||
MainView.VSplitLeft(30.0f, 0, &ExtMenu);
|
MainView.VSplitLeft(30.0f, 0, &ExtMenu);
|
||||||
ExtMenu.VSplitLeft(100.0f, &ExtMenu, 0);
|
ExtMenu.VSplitLeft(100.0f, &ExtMenu, 0);
|
||||||
|
|
||||||
|
ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
|
||||||
|
ExtMenu.HSplitBottom(5.0f, &ExtMenu, nullptr);
|
||||||
|
static CButtonContainer s_ConsoleButton;
|
||||||
|
if(DoButton_Menu(&s_ConsoleButton, Localize("Console"), 0, &Button, nullptr, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
|
||||||
|
{
|
||||||
|
GameClient()->m_GameConsole.Toggle(CGameConsole::CONSOLETYPE_LOCAL);
|
||||||
|
}
|
||||||
|
|
||||||
ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
|
ExtMenu.HSplitBottom(20.0f, &ExtMenu, &Button);
|
||||||
static CButtonContainer s_DiscordButton;
|
static CButtonContainer s_DiscordButton;
|
||||||
if(DoButton_Menu(&s_DiscordButton, Localize("Discord"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
|
if(DoButton_Menu(&s_DiscordButton, Localize("Discord"), 0, &Button, 0, IGraphics::CORNER_ALL, 5.0f, 0.0f, ColorRGBA(0.0f, 0.0f, 0.0f, 0.25f)))
|
||||||
|
|
Loading…
Reference in a new issue