From d0febbec321048135ca1f4a91250739f89570ed9 Mon Sep 17 00:00:00 2001 From: Vojtech Bubnik <bubnikv@gmail.com> Date: Tue, 16 Mar 2021 08:54:37 +0100 Subject: [PATCH] Disable the new Toggle fullscreen menu item on OSX, it adds its own. --- src/slic3r/GUI/MainFrame.cpp | 11 ++++------- 1 file changed, 4 insertions(+), 7 deletions(-) diff --git a/src/slic3r/GUI/MainFrame.cpp b/src/slic3r/GUI/MainFrame.cpp index 4fbb29bfd..aeac68d94 100644 --- 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