Changeset 7918 in vbox

Timestamp:

Apr 11, 2008 1:48:38 PM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4-OSX: Fixed seamless mode on Mac OS X.

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxConsoleWnd.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox4/include/VBoxConsoleWnd.h

@@ -189 +189 @@
     void exitSeamless();
 
+    void switchToFullscreen (bool aOn, bool aSeamless);
     void setViewInSeamlessMode (const QRect &aTargetRect);
 
@@ -338 +339 @@
 
 #ifdef Q_WS_MAC
-    // Dock images.
+    /* For seamless maximizing */
+    QRect mNormalGeometry;
+    Qt::WindowFlags mSavedFlags;
+    /* Dock images */
     CGImageRef dockImgStatePaused;
     CGImageRef dockImgStateSaving;

trunk/src/VBox/Frontends/VirtualBox4/src/VBoxConsoleWnd.cpp

@@ -2103 +2103 @@
         }
 
-#ifdef Q_WS_MAC
-        if (!aSeamless)
-        {
-            /* Make the apple menu bar go away before setMaximumSize! */
-            OSStatus orc = SetSystemUIMode (kUIModeAllHidden, kUIOptionDisableAppleMenu);
-            if (orc)
-                LogRel (("Error: Failed to change UI mode (rc=%#x) when changing to fullscreen mode. (=> menu bar trouble)\n", orc));
-        }
-#endif
-
         /* Adjust colors and appearance. */
         mErasePalette = centralWidget()->palette();
@@ -2126 +2116 @@
 
         /* Going fullscreen */
-        setWindowState (windowState() ^ Qt::WindowFullScreen);
+        switchToFullscreen (aOn, aSeamless);
 #ifdef Q_WS_MAC /* setMask seems to not include the far border pixels. */
 //        QRect maskRect = dtw->screenGeometry (this);
@@ -2231 +2221 @@
 
         /* Going normal || maximized */
-        setWindowState (windowState() ^ Qt::WindowFullScreen);
+        switchToFullscreen (aOn, aSeamless);
 
         qApp->processEvents();
@@ -2267 +2257 @@
 // Private slots
 /////////////////////////////////////////////////////////////////////////////
+void VBoxConsoleWnd::switchToFullscreen (bool aOn, bool aSeamless)
+{
+#ifdef Q_WS_MAC
+    if (aSeamless)
+        if (aOn)
+        {
+            /* Save for later restoring */
+            mNormalGeometry = geometry();
+            mSavedFlags = windowFlags();
+            /* Remove the frame from the window */
+            setParent (0, Qt::Window | Qt::FramelessWindowHint | (windowFlags() & 0xffff0000));
+            /* Set it maximized */
+            setWindowState (windowState() ^ Qt::WindowMaximized);
+        }
+        else
+        {
+            /* Restore old values */
+            setParent (0, mSavedFlags);
+            setGeometry (mNormalGeometry);
+        }
+    else
+        /* Here we are going really fullscreen */
+        setWindowState (windowState() ^ Qt::WindowFullScreen);
+#else
+    NOREF (aOn);
+    NOREF (aSeamless);
+    setWindowState (windowState() ^ Qt::WindowFullScreen);
+#endif
+}
+
 void VBoxConsoleWnd::setViewInSeamlessMode (const QRect &aTargetRect)
 {
+#ifndef Q_WS_MAC
     if (mIsSeamless)
     {
@@ -2290 +2311 @@
                                            QSizePolicy::Preferred, QSizePolicy::Fixed);
     }
+#else // !Q_WS_MAC
+    NOREF (aTargetRect);
+#endif // !Q_WS_MAC
 }