diff options
| author | Robert Müller <robytemueller@gmail.com> | 2022-07-25 19:40:28 +0200 |
|---|---|---|
| committer | Robert Müller <robytemueller@gmail.com> | 2023-06-13 20:08:55 +0200 |
| commit | c21a94ce446304e9b42cae764d2fbb6e94fb605a (patch) | |
| tree | 74b1f32f65f7a8809d9562a54e00622c2a1d5305 | |
| parent | 919c2cae9c814ef84d48e6d7d04134b548bd9263 (diff) | |
Add wide view checkbox to settings, remove button in the top right
| -rw-r--r-- | src/game/client/components/menus.cpp | 5 | ||||
| -rw-r--r-- | src/game/client/components/menus_settings.cpp | 10 |
2 files changed, 7 insertions, 8 deletions
diff --git a/src/game/client/components/menus.cpp b/src/game/client/components/menus.cpp index cc6ac64a3..3fe5fe858 100644 --- a/src/game/client/components/menus.cpp +++ b/src/game/client/components/menus.cpp @@ -1097,11 +1097,6 @@ void CMenus::RenderMenu(CUIRect Screen) m_MenuPage = PAGE_SETTINGS; } } - Row.VSplitRight(5.0f, &Row, 0); - Row.VSplitRight(TopOffset, &Row, &Button); - static CButtonContainer s_WideButton; - if((m_MenuPage == PAGE_INTERNET || m_MenuPage == PAGE_LAN || m_MenuPage == PAGE_DEMOS) && DoButton_MenuTabTop(&s_WideButton, Config()->m_UiWideview ? "\xe2\x96\xaa" : "\xe2\x96\xac", false, &Button, 1.0f, 1.0f, CUIRect::CORNER_B)) - Config()->m_UiWideview ^= 1; } // render current page diff --git a/src/game/client/components/menus_settings.cpp b/src/game/client/components/menus_settings.cpp index 315e16512..6966e8cc8 100644 --- a/src/game/client/components/menus_settings.cpp +++ b/src/game/client/components/menus_settings.cpp @@ -978,16 +978,20 @@ void CMenus::RenderSettingsGeneral(CUIRect MainView) Client.HSplitTop(ButtonHeight, &Label, &Client); UI()->DoLabel(&Label, Localize("Client"), ButtonHeight*CUI::ms_FontmodHeight*0.8f, TEXTALIGN_MC); + CUIRect ClientLeft, ClientRight; Client.HSplitTop(Spacing, 0, &Client); - Client.HSplitTop(ButtonHeight, &Button, &Client); - if(DoButton_CheckBox(&Config()->m_ClSkipStartMenu, Localize("Skip the main menu"), Config()->m_ClSkipStartMenu, &Button)) + Client.HSplitTop(ButtonHeight, &ClientLeft, &Client); + ClientLeft.VSplitMid(&ClientLeft, &ClientRight, Spacing); + if(DoButton_CheckBox(&Config()->m_ClSkipStartMenu, Localize("Skip the main menu"), Config()->m_ClSkipStartMenu, &ClientLeft)) Config()->m_ClSkipStartMenu ^= 1; + if(DoButton_CheckBox(&Config()->m_UiWideview, Localize("Wide menu"), Config()->m_UiWideview, &ClientRight)) + Config()->m_UiWideview ^= 1; + Client.HSplitTop(Spacing, 0, &Client); Client.HSplitTop(ButtonHeight, &Button, &Client); UI()->DoScrollbarOption(&Config()->m_ClMenuAlpha, &Config()->m_ClMenuAlpha, &Button, Localize("Menu background opacity"), 0, 75); - CUIRect ClientLeft, ClientRight; Client.HSplitTop(Spacing, 0, &Client); Client.HSplitTop(ButtonHeight, &ClientLeft, &Client); ClientLeft.VSplitMid(&ClientLeft, &ClientRight, Spacing); |