From 7af80c77129988654566ea032548ac8f88e78a85 Mon Sep 17 00:00:00 2001 From: archshift Date: Wed, 13 Aug 2014 02:21:21 -0700 Subject: [PATCH] Disable toolbar toggle in main window fullscreen --- Source/Core/DolphinWX/Frame.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/Source/Core/DolphinWX/Frame.cpp b/Source/Core/DolphinWX/Frame.cpp index 0f96f49460..e9edc83517 100644 --- a/Source/Core/DolphinWX/Frame.cpp +++ b/Source/Core/DolphinWX/Frame.cpp @@ -1242,15 +1242,23 @@ void CFrame::DoFullscreen(bool enable_fullscreen) // Save the current mode before going to fullscreen AuiCurrent = m_Mgr->SavePerspective(); m_Mgr->LoadPerspective(AuiFullscreen, true); + // Hide toolbar DoToggleToolbar(false); + + // Disable toggling toolbar in menu + GetMenuBar()->FindItem(IDM_TOGGLE_TOOLBAR)->Enable(false); } else { // Restore saved perspective m_Mgr->LoadPerspective(AuiCurrent, true); + // 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); } } else