Changeset 6146 in vbox for trunk/src/VBox

Timestamp:

Dec 19, 2007 8:58:24 AM (17 years ago)

Author:

vboxsync

Message:

Fixed fullscreen mode on mac os x: 1. wasHidden is wrong (todo find out why), so perform show() instead of hide(). 2. must hide the mac os x stuff before setting the maximum size, or qt will (it seems) adjust it according to visible screen region. 3. the mask (setMask) rectangle needs to be adjusted or we'll get a one pixle border on the right and bottom of the screen (another qt bug?)

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp (modified) (4 diffs)

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

@@ -2023 +2023 @@
         delete list;
 
+#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. */
         erase_color = centralWidget()->eraseColor();
@@ -2034 +2044 @@
         /* Going fullscreen */
         setWindowState (windowState() ^ WindowFullScreen);
+#ifdef Q_WS_MAC /* setMask seems to not include the far border pixels. */
+        QRect maskRect = dtw->screenGeometry (this);
+        maskRect.setRight(maskRect.right() + 1);
+        maskRect.setBottom(maskRect.bottom() + 1);
+        setMask (maskRect);
+#else
         setMask (dtw->screenGeometry (this));
-
-#ifdef Q_WS_MAC
-        if (!aSeamless)
-        {
-            /* Make the apple menu bar go away. */
-            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
 
@@ -2070 +2076 @@
 #ifdef Q_WS_MAC
         if (!aSeamless)
-        {
             SetSystemUIMode (kUIModeNormal, 0);
-        }
 #endif
 
@@ -2096 +2100 @@
     }
 
+#ifdef Q_WS_MAC /* wasHidden is wrong on the mac it seems. */
+    /** @todo figure out what is really wrong here... */
+    if (!wasHidden)
+        show();
+#else
     if (wasHidden)
         hide();
-
+#endif
     return true;
 }