diff options
| author | Shawn Hoffman <godisgovernment@gmail.com> | 2014-08-24 20:57:57 -0700 |
|---|---|---|
| committer | Shawn Hoffman <godisgovernment@gmail.com> | 2014-09-03 03:02:13 -0700 |
| commit | fd2343e431d5bdb470677ca4f1a61da3bc8a7a15 (patch) | |
| tree | efc80c2a7bc51deafe6c4b2515d72dff8878429a /Source | |
| parent | 46c1a0f03b5dc2d99a26dc45667d2ff2bb368730 (diff) | |
Re-implement hiding of the menubar in fullscreen with render to main.
Diffstat (limited to 'Source')
| -rw-r--r-- | Source/Core/DolphinWX/Frame.cpp | 25 |
1 files changed, 21 insertions, 4 deletions
diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 190c0947cd..7885986fb2 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -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 |