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

Fixes

Browse source
This commit is contained in:
Дядя Женя 2020-12-16 07:55:41 +03:00
parent d80cdd20d4
commit f4b8033056
3 changed files with 30 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1249,7 +1249,10 @@ int CMenus::RenderMenubar(CUIRect r)
if(Client()->State() == IClient::STATE_OFFLINE)
SetMenuPage(NewPage);
else
{
m_PrevGamePage = m_GamePage;
m_GamePage = NewPage;
}
}
return 0;
@ -1736,13 +1739,8 @@ int CMenus::Render()
RenderServerbrowser(MainView);
}
else if(m_MenuPage == PAGE_SETTINGS)
{
RenderSettings(MainView);
// Render Color Picker only on settings page and last
RenderColorPicker();
}
// do tab bar
RenderMenubar(TabBar);
}
@ -2640,7 +2638,10 @@ void CMenus::RenderThemeSelection(CUIRect MainView, bool Header)
void CMenus::SetActive(bool Active)
{
if(Active != m_MenuActive)
{
ms_ColorPicker.m_Active = false;
Input()->SetIMEState(Active);
}
m_MenuActive = Active;
if(!m_MenuActive)
{
@ -3091,6 +3092,7 @@ const CMenus::CMenuImage *CMenus::FindMenuImage(const char *pName)
void CMenus::SetMenuPage(int NewPage)
{
m_PrevMenuPage = m_MenuPage;
m_MenuPage = NewPage;
if(NewPage >= PAGE_INTERNET && NewPage <= PAGE_KOG)
g_Config.m_UiPage = NewPage;

2
src/game/client/components/menus.h
View file

@ -271,7 +271,9 @@ protected:
void ClearCustomItems(int CurTab);
int m_MenuPage;
int m_PrevMenuPage;
int m_GamePage;
int m_PrevGamePage;
int m_Popup;
int m_ActivePage;
bool m_ShowStart;

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

@ -1490,6 +1490,7 @@ void CMenus::RenderSettings(CUIRect MainView)
Localize("Assets")};
int NumTabs = (int)(sizeof(aTabs) / sizeof(*aTabs));
int PreviousPage = g_Config.m_UiSettingsPage;
for(int i = 0; i < NumTabs; i++)
{
@ -1499,6 +1500,9 @@ void CMenus::RenderSettings(CUIRect MainView)
g_Config.m_UiSettingsPage = i;
}
if(PreviousPage != g_Config.m_UiSettingsPage)
ms_ColorPicker.m_Active = false;
MainView.Margin(10.0f, &MainView);
if(g_Config.m_UiSettingsPage == SETTINGS_LANGUAGE)
@ -1560,6 +1564,8 @@ void CMenus::RenderSettings(CUIRect MainView)
}
else if(m_NeedRestartGeneral || m_NeedRestartSkins || m_NeedRestartGraphics || m_NeedRestartSound || m_NeedRestartDDNet)
UI()->DoLabelScaled(&RestartWarning, Localize("You must restart the game for all settings to take effect."), 14.0f, -1);
RenderColorPicker();
}
ColorHSLA CMenus::RenderHSLColorPicker(const CUIRect *pRect, unsigned int *pColor, bool Alpha)
@ -1707,7 +1713,6 @@ void CMenus::RenderSettingsHUD(CUIRect MainView)
int i = 0;
static int ResetIDs[24];
DoLine_ColorPicker(&ResetIDs[i++], LineSize, WantedPickerPosition, LabelSize, LineSpacing, &Chat, Localize("System message"), &g_Config.m_ClMessageSystemColor, ColorRGBA(1.0f, 1.0f, 0.5f), true, true, &g_Config.m_ClShowChatSystem);
DoLine_ColorPicker(&ResetIDs[i++], LineSize, WantedPickerPosition, LabelSize, LineSpacing, &Chat, Localize("Highlighted message"), &g_Config.m_ClMessageHighlightColor, ColorRGBA(1.0f, 0.5f, 0.5f));
@ -2121,36 +2126,32 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
if(CheckSettings)
m_NeedRestartDDNet = s_InpMouseOld != g_Config.m_InpMouseOld;
CUIRect aRects[2];
Left.HSplitTop(5.0f, &Button, &Left);
Right.HSplitTop(25.0f, &Button, &Right);
aRects[0] = Left;
aRects[1] = Right;
aRects[0].VSplitRight(10.0f, &aRects[0], 0);
aRects[1].VSplitLeft(10.0f, 0, &aRects[1]);
Left.VSplitRight(10.0f, &Left, 0x0);
Right.VSplitLeft(10.0f, 0x0, &Right);
Left.HSplitTop(25.0f, 0x0, &Left);
CUIRect TempLabel;
Right.HSplitTop(25.0f, &TempLabel, &Right);
Right.HSplitTop(5.0f, 0x0, &Right);
unsigned *paColors[2] = {&g_Config.m_ClBackgroundColor, &g_Config.m_ClBackgroundEntitiesColor};
const char *paParts[2] = {Localize("Background (regular)"), Localize("Background (entities)")};
static int ResetID1 = 0;
static int ResetID2 = 0;
ColorRGBA GreyDefault(0.5f, 0.5f, 0.5f, 1);
DoLine_ColorPicker(&ResetID1, 25.0f, 194.0f, 13.0f, 5.0f, &Left, Localize("Background (regular)"), &g_Config.m_ClBackgroundColor, GreyDefault, false);
DoLine_ColorPicker(&ResetID2, 25.0f, 194.0f, 13.0f, 5.0f, &Left, Localize("Background (entities)"), &g_Config.m_ClBackgroundEntitiesColor, GreyDefault, false);
for(int i = 0; i < 2; i++)
{
aRects[i].HSplitTop(20.0f, &Label, &aRects[i]);
UI()->DoLabelScaled(&Label, paParts[i], 14.0f, -1);
aRects[i].VSplitLeft(10.0f, 0, &aRects[i]);
aRects[i].HSplitTop(2.5f, 0, &aRects[i]);
RenderHSLScrollbars(&aRects[i], paColors[i]);
}
UI()->DoLabelScaled(&TempLabel, Localize("Background (entities)"), 20.0f, -1);
{
static float s_Map = 0.0f;
aRects[1].HSplitTop(25.0f, &Background, &aRects[1]);
Right.HSplitTop(25.0f, &Background, &Right);
Background.HSplitTop(20.0f, &Background, 0);
Background.VSplitLeft(100.0f, &Label, &Left);
UI()->DoLabelScaled(&Label, Localize("Map"), 14.0f, -1);
DoEditBox(g_Config.m_ClBackgroundEntities, &Left, g_Config.m_ClBackgroundEntities, sizeof(g_Config.m_ClBackgroundEntities), 14.0f, &s_Map);
aRects[1].HSplitTop(20.0f, &Button, &aRects[1]);
Right.HSplitTop(20.0f, &Button, &Right);
bool UseCurrentMap = str_comp(g_Config.m_ClBackgroundEntities, CURRENT_MAP) == 0;
if(DoButton_CheckBox(&UseCurrentMap, Localize("Use current map as background"), UseCurrentMap, &Button))
{
@ -2160,7 +2161,7 @@ void CMenus::RenderSettingsDDNet(CUIRect MainView)
str_copy(g_Config.m_ClBackgroundEntities, CURRENT_MAP, sizeof(g_Config.m_ClBackgroundEntities));
}
aRects[1].HSplitTop(20.0f, &Button, 0);
Right.HSplitTop(20.0f, &Button, 0);
if(DoButton_CheckBox(&g_Config.m_ClBackgroundShowTilesLayers, Localize("Show tiles layers from BG map"), g_Config.m_ClBackgroundShowTilesLayers, &Button))
{
g_Config.m_ClBackgroundShowTilesLayers ^= 1;