fix full screen display on main monitor (hide menus until mouseover)

Author: Brian Doyle

src/slic3r/GUI/CameraFullscreenMac.hpp

@@ -2,12 +2,17 @@
 
 #ifdef __APPLE__
 
+class wxWindow;
+
 namespace Slic3r { namespace GUI {
 
 using CameraFullscreenEscapeCallback = void (*)(void *);
 
 void *install_camera_fullscreen_escape_monitor(CameraFullscreenEscapeCallback callback, void *context);
 void  uninstall_camera_fullscreen_escape_monitor(void *monitor);
+void *enter_camera_fullscreen_presentation(wxWindow *window);
+void  apply_camera_fullscreen_frame(wxWindow *window);
+void  restore_camera_fullscreen_presentation(void *presentation);
 
 }} // namespace Slic3r::GUI
 

src/slic3r/GUI/CameraFullscreenMac.mm

@@ -4,6 +4,8 @@
 
 #import <Cocoa/Cocoa.h>
 
+#include <wx/window.h>
+
 namespace Slic3r { namespace GUI {
 
 namespace {
@@ -17,6 +19,20 @@
     void *context{ nullptr };
 };
 
+struct CameraFullscreenPresentationState
+{
+    NSApplicationPresentationOptions presentation_options{ NSApplicationPresentationDefault };
+};
+
+NSWindow *camera_fullscreen_window(wxWindow *window)
+{
+    if (!window || !window->GetHandle())
+        return nil;
+
+    NSView *view = (NSView *) window->GetHandle();
+    return [view window];
+}
+
 } // namespace
 
 void *install_camera_fullscreen_escape_monitor(CameraFullscreenEscapeCallback callback, void *context)
@@ -45,6 +61,43 @@ void uninstall_camera_fullscreen_escape_monitor(void *monitor)
     delete state;
 }
 
+void *enter_camera_fullscreen_presentation(wxWindow *window)
+{
+    auto *state = new CameraFullscreenPresentationState;
+    state->presentation_options = [NSApp presentationOptions];
+
+    NSApplicationPresentationOptions fullscreen_options = state->presentation_options;
+    fullscreen_options &= ~(NSApplicationPresentationHideDock | NSApplicationPresentationHideMenuBar);
+    fullscreen_options |= NSApplicationPresentationAutoHideDock | NSApplicationPresentationAutoHideMenuBar;
+    [NSApp setPresentationOptions:fullscreen_options];
+
+    apply_camera_fullscreen_frame(window);
+    return state;
+}
+
+void apply_camera_fullscreen_frame(wxWindow *window)
+{
+    NSWindow *ns_window = camera_fullscreen_window(window);
+    if (!ns_window)
+        return;
+
+    NSScreen *screen = [ns_window screen] ?: [NSScreen mainScreen];
+    if (!screen)
+        return;
+
+    [ns_window setFrame:[screen frame] display:YES animate:NO];
+}
+
+void restore_camera_fullscreen_presentation(void *presentation)
+{
+    auto *state = static_cast<CameraFullscreenPresentationState *>(presentation);
+    if (!state)
+        return;
+
+    [NSApp setPresentationOptions:state->presentation_options];
+    delete state;
+}
+
 }} // namespace Slic3r::GUI
 
 #endif

src/slic3r/GUI/StatusPanel.cpp

@@ -222,6 +222,7 @@ class CameraFullscreenFrame : public wxFrame
     ~CameraFullscreenFrame() override
     {
 #ifdef __APPLE__
+        restore_camera_fullscreen_presentation(m_presentation_state);
         uninstall_camera_fullscreen_escape_monitor(m_escape_monitor);
 #endif
     }
@@ -230,18 +231,24 @@ class CameraFullscreenFrame : public wxFrame
 
     void show_camera_view(bool active_monitor_only)
     {
-#ifdef __APPLE__
-        m_native_fullscreen = !active_monitor_only;
-#else
         m_native_fullscreen = false;
-#endif
         if (active_monitor_only) {
+#ifdef __APPLE__
+            m_presentation_state = enter_camera_fullscreen_presentation(this);
+#endif
             SetSize(display_geometry_for(m_owner ? static_cast<wxWindow *>(m_owner) : this));
             Show();
+#ifdef __APPLE__
+            apply_camera_fullscreen_frame(this);
+#else
+            ShowFullScreen(true, wxFULLSCREEN_ALL);
+            m_native_fullscreen = true;
+#endif
         } else {
 #ifdef __APPLE__
             Show();
             ShowFullScreen(true, wxFULLSCREEN_ALL);
+            m_native_fullscreen = true;
 #else
             SetSize(all_display_geometry());
             Show();
@@ -255,6 +262,10 @@ class CameraFullscreenFrame : public wxFrame
     void exit_camera_view()
     {
         if (m_native_fullscreen) ShowFullScreen(false);
+#ifdef __APPLE__
+        restore_camera_fullscreen_presentation(m_presentation_state);
+        m_presentation_state = nullptr;
+#endif
     }
 
     void attach_media(wxMediaCtrl3 *media_ctrl)
@@ -431,7 +442,8 @@ class CameraFullscreenFrame : public wxFrame
     wxTimer m_hide_timer;
     wxTimer m_fade_timer;
 #ifdef __APPLE__
-    void *m_escape_monitor{ nullptr };
+    void *m_escape_monitor{nullptr};
+    void *m_presentation_state{nullptr};
 #endif
     wxWindowID m_escape_accel_id{ wxID_ANY };
     int m_close_alpha{ 0 };