Disable the new Toggle fullscreen menu item on OSX, it adds its own.

prusa3d · Mar 16, 2021 · d0febbe · d0febbe
1 parent fc7762e
commit d0febbe
Showing 1 changed file with 4 additions and 7 deletions.
diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp
@@ -1217,17 +1217,14 @@ void MainFrame::init_menubar_as_editor()
         append_menu_check_item(viewMenu, wxID_ANY, _L("&Collapse sidebar") + sep + "Shift+" + sep_space + "Tab", _L("Collapse sidebar"),
             [this](wxCommandEvent&) { m_plater->collapse_sidebar(!m_plater->is_sidebar_collapsed()); }, this,
             []() { return true; }, [this]() { return m_plater->is_sidebar_collapsed(); }, this);
-        append_menu_check_item(viewMenu, wxID_ANY, _L("&Full screen") + "\t" + 
-#ifdef __APPLE__
-            "RAWCTRL+CTRL+F"
-#else
-            "F11"
-#endif
-            , _L("Full screen"),
+#ifndef __APPLE__
+        // OSX adds its own menu item to toggle fullscreen.
+        append_menu_check_item(viewMenu, wxID_ANY, _L("&Full screen") + "\t" + "F11", _L("Full screen"),
             [this](wxCommandEvent&) { this->ShowFullScreen(!this->IsFullScreen(), 
                 // wxFULLSCREEN_ALL: wxFULLSCREEN_NOMENUBAR | wxFULLSCREEN_NOTOOLBAR | wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION
                 wxFULLSCREEN_NOSTATUSBAR | wxFULLSCREEN_NOBORDER | wxFULLSCREEN_NOCAPTION); }, 
             this, []() { return true; }, [this]() { return this->IsFullScreen(); }, this);
+#endif // __APPLE__
     }
 
     // Help menu