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

Merge pull request #8029 from Robyt3/Menus-RenderPopupFullscreen-Function

Browse source 
Extract `CMenus::RenderPopupFullscreen` function
This commit is contained in:
heinrich5991 2024-02-28 22:39:29 +00:00 committed by GitHub
parent ffc7ad0924 6080cffcbb
commit 9620a9d3d9
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 700 additions and 694 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1157,6 +1157,20 @@ void CMenus::Render()
} }
} }
else else
{
RenderPopupFullscreen(Screen);
}
UI()->RenderPopupMenus();
// Handle this escape hotkey after popup menus
if(!m_ShowStart && Client()->State() == IClient::STATE_OFFLINE && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
{
m_ShowStart = true;
}
}
void CMenus::RenderPopupFullscreen(CUIRect Screen)
{ {
char aBuf[1536]; char aBuf[1536];
const char *pTitle = ""; const char *pTitle = "";
@ -1854,15 +1868,6 @@ void CMenus::Render()
UI()->SetActiveItem(nullptr); UI()->SetActiveItem(nullptr);
} }
UI()->RenderPopupMenus();
// Handle this escape hotkey after popup menus
if(!m_ShowStart && Client()->State() == IClient::STATE_OFFLINE && UI()->ConsumeHotkey(CUI::HOTKEY_ESCAPE))
{
m_ShowStart = true;
}
}
#if defined(CONF_VIDEORECORDER) #if defined(CONF_VIDEORECORDER)
void CMenus::PopupConfirmDemoReplaceVideo() void CMenus::PopupConfirmDemoReplaceVideo()
{ {

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

@ -420,6 +420,7 @@ protected:
// found in menus.cpp // found in menus.cpp
void Render(); void Render();
void RenderPopupFullscreen(CUIRect Screen);
#if defined(CONF_VIDEORECORDER) #if defined(CONF_VIDEORECORDER)
void PopupConfirmDemoReplaceVideo(); void PopupConfirmDemoReplaceVideo();
#endif #endif