Changeset 27025 in vbox for trunk/src/VBox

Timestamp:

Mar 4, 2010 1:47:10 PM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: new core: more Mac related fixes

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless

Files:

• UIMachineWindowSeamless.cpp (modified) (2 diffs)
• UIMachineWindowSeamless.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -132 +132 @@
 #endif
 
+#ifdef Q_WS_MAC
+bool UIMachineWindowSeamless::event(QEvent *pEvent)
+{
+    switch (pEvent->type())
+    {
+        case QEvent::Paint:
+        {
+            /* Clear the background */
+            CGContextClearRect(::darwinToCGContextRef(this), ::darwinToCGRect(frameGeometry()));
+            break;
+        }
+        default:
+            break;
+    }
+    return QIMainDialog::event(pEvent);
+}
+#endif /* Q_WS_MAC */
+
 void UIMachineWindowSeamless::closeEvent(QCloseEvent *pEvent)
 {
@@ -146 +164 @@
     move(geometry.topLeft());
     resize(geometry.size());
+
+#ifdef Q_WS_MAC
+    /* Please note: All the stuff below has to be done after the window has
+     * switched to fullscreen. Qt changes the winId on the fullscreen
+     * switch and make this stuff useless with the old winId. So please be
+     * careful on rearrangement of the method calls. */
+    ::darwinSetShowsWindowTransparent(this, true);
+#endif
+
     /* Perform these events: */
     qApp->processEvents();
+
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.h

@@ -58 +58 @@
 #ifdef Q_WS_X11
     bool x11Event(XEvent *pEvent);
-#endif
+#endif /* Q_WS_X11 */
     void closeEvent(QCloseEvent *pEvent);
+#ifdef Q_WS_MAC
+    bool event(QEvent *pEvent);
+#endif /* Q_WS_MAC */
 
     /* Prepare helpers: */
@@ -65 +68 @@
 #ifdef Q_WS_MAC
     void prepareMenu();
-#endif
+#endif /* Q_WS_MAC */
     void prepareMachineView();
 #ifdef Q_WS_MAC
     void loadWindowSettings();
-#endif
+#endif /* Q_WS_MAC */
 
     /* Cleanup helpers: */
 #ifdef Q_WS_MAC
     //void saveWindowSettings() {}
-#endif
+#endif /* Q_WS_MAC */
     void cleanupMachineView();
 #ifdef Q_WS_MAC
     //void cleanupMenu() {}
-#endif
+#endif /* Q_WS_MAC */
     //void cleanupSeamless() {}
 
@@ -88 +91 @@
 #ifdef Q_WS_WIN
     QRegion m_prevRegion;
-#endif
+#endif /* Q_WS_WIN */
 
     /* Factory support: */