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

Merge #2294

Browse source 
2294: Make the learn button fit (fixes #2293) r=edg-l a=def-

![screenshot_2020-06-20_14-57-03](https://user-images.githubusercontent.com/2335377/85202386-55454480-b306-11ea-99f5-e37ba6e616b5.png)


Co-authored-by: def <dennis@felsin9.de>
This commit is contained in:
bors[bot] 2020-06-21 09:31:51 +00:00 committed by GitHub
parent 715ef25328 1610079020
commit 80f19b789a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
src/game/client/components/menus.cpp
View file

@ -674,14 +674,14 @@ int CMenus::RenderMenubar(CUIRect r)
if(Client()->State() == IClient::STATE_OFFLINE) if(Client()->State() == IClient::STATE_OFFLINE)
{ {
// offline menus // offline menus
Box.VSplitLeft(90.0f, &Button, &Box); Box.VSplitLeft(60.0f, &Button, &Box);
static int s_NewsButton=0; static int s_NewsButton=0;
if(DoButton_MenuTab(&s_NewsButton, Localize("News"), m_ActivePage==PAGE_NEWS, &Button, CUI::CORNER_TL)) if(DoButton_MenuTab(&s_NewsButton, Localize("News"), m_ActivePage==PAGE_NEWS, &Button, CUI::CORNER_TL))
{ {
NewPage = PAGE_NEWS; NewPage = PAGE_NEWS;
m_DoubleClickIndex = -1; m_DoubleClickIndex = -1;
} }
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(60.0f, &Button, &Box);
static int s_LearnButton=0; static int s_LearnButton=0;
if(DoButton_MenuTab(&s_LearnButton, Localize("Learn"), false, &Button, CUI::CORNER_TR)) if(DoButton_MenuTab(&s_LearnButton, Localize("Learn"), false, &Button, CUI::CORNER_TR))
{ {
@ -692,7 +692,7 @@ int CMenus::RenderMenubar(CUIRect r)
m_DoubleClickIndex = -1; m_DoubleClickIndex = -1;
} }
Box.VSplitLeft(10.0f, 0, &Box); Box.VSplitLeft(5.0f, 0, &Box);
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(100.0f, &Button, &Box);
static int s_InternetButton=0; static int s_InternetButton=0;
@ -750,8 +750,8 @@ int CMenus::RenderMenubar(CUIRect r)
m_DoubleClickIndex = -1; m_DoubleClickIndex = -1;
} }
Box.VSplitLeft(10.0f, 0, &Box); Box.VSplitLeft(5.0f, 0, &Box);
Box.VSplitLeft(100.0f, &Button, &Box); Box.VSplitLeft(80.0f, &Button, &Box);
static int s_DemosButton=0; static int s_DemosButton=0;
if(DoButton_MenuTab(&s_DemosButton, Localize("Demos"), m_ActivePage==PAGE_DEMOS, &Button, CUI::CORNER_T)) if(DoButton_MenuTab(&s_DemosButton, Localize("Demos"), m_ActivePage==PAGE_DEMOS, &Button, CUI::CORNER_T))
{ {