Re-implement hiding of the menubar in fullscreen with render to main.

This commit is contained in:
Shawn Hoffman 2014-08-24 20:57:57 -07:00
parent 46c1a0f03b
commit fd2343e431
1 changed files with 21 additions and 4 deletions

View File

@ -1252,8 +1252,15 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
// Hide toolbar
DoToggleToolbar(false);
// Disable toggling toolbar in menu
GetMenuBar()->FindItem(IDM_TOGGLE_TOOLBAR)->Enable(false);
// Hide menubar (by having wxwidgets delete it)
SetMenuBar(nullptr);
// Hide the statusbar if enabled
if (GetStatusBar()->IsShown())
{
GetStatusBar()->Hide();
this->SendSizeEvent();
}
}
else
{
@ -1263,8 +1270,18 @@ void CFrame::DoFullscreen(bool enable_fullscreen)
// Restore toolbar to the status it was at before going fullscreen.
DoToggleToolbar(SConfig::GetInstance().m_InterfaceToolbar);
// Re-enable toggling toolbar in menu
GetMenuBar()->FindItem(IDM_TOGGLE_TOOLBAR)->Enable(true);
// Recreate the menubar if needed.
if (GetMenuBar() == nullptr)
{
CreateMenu();
}
// Show statusbar if enabled
if (SConfig::GetInstance().m_InterfaceStatusbar)
{
GetStatusBar()->Show();
this->SendSizeEvent();
}
}
}
else