Changeset 46256 in vbox for trunk/src

Timestamp:

May 24, 2013 3:57:03 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6749: Runtime UI: Some seamless/fullscreen modes cleanup.

Location:

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

Files:

• fullscreen/UIMachineWindowFullscreen.cpp (modified) (3 diffs)
• seamless/UIMachineWindowSeamless.cpp (modified) (5 diffs)
• seamless/UIMachineWindowSeamless.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -22 +22 @@
 #include <QMenu>
 #include <QTimer>
-#ifdef Q_WS_MAC
-# include <QMenuBar>
-#endif /* Q_WS_MAC */
 
 /* GUI includes: */
@@ -180 +177 @@
             if (pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
             {
-                /* Make sure the window is placed on valid screen
-                 * before we are show fullscreen window: */
+                /* Make sure the window is maximized and placed on valid screen: */
                 placeOnScreen();
 
@@ -193 +189 @@
 #endif /* Q_WS_WIN */
 
-                /* Show window fullscreen: */
+                /* Show in fullscreen mode: */
                 showFullScreen();
 
                 /* Make sure the window is placed on valid screen again
                  * after window is shown & window's decorations applied.
-                 * That is required due to X11 Window Geometry Rules. */
+                 * That is required (still?) due to X11 Window Geometry Rules. */
                 placeOnScreen();
-
-#ifdef Q_WS_MAC
-                /* Make sure it is really on the right place (especially on the Mac): */
-                QRect r = QApplication::desktop()->screenGeometry(qobject_cast<UIMachineLogicFullscreen*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId));
-                move(r.topLeft());
-#endif /* Q_WS_MAC */
 
                 /* Return early: */

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

@@ -22 +22 @@
 #include <QMenu>
 #include <QTimer>
-#ifdef Q_WS_MAC
-# include <QMenuBar>
-#endif /* Q_WS_MAC */
 
 /* GUI includes: */
@@ -87 +84 @@
     UIMachineWindow::prepareVisualState();
 
+    /* Make sure we have no background
+     * until the first one paint-event: */
+    setAttribute(Qt::WA_NoSystemBackground);
+
 #ifdef Q_WS_WIN
-    /* Enable translucent background for Win host,
-     * Mac host has it native, Qt 4.8.3 under x11 host has is broken: */
+    /* Using Qt API to enable translucent background for the Win host.
+     * - Under Mac host Qt doesn't allows to disable window-shadows
+     *   until version 4.8, but minimum supported version is 4.7.1 for now.
+     * - Under x11 host Qt 4.8.3 has it broken wih KDE 4.9 for now: */
     setAttribute(Qt::WA_TranslucentBackground);
 #endif /* Q_WS_WIN */
 
 #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. */
+    /* Using native API to enable translucent background for the Mac host.
+     * - We also want to disable window-shadows which is possible
+     *   using Qt::WA_MacNoShadow only since Qt 4.8,
+     *   while minimum supported version is 4.7.1 for now: */
     ::darwinSetShowsWindowTransparent(this, true);
 #endif /* Q_WS_MAC */
@@ -159 +162 @@
 {
 #ifndef Q_WS_MAC
-    /* Cleeanup mini-toolbar: */
+    /* Cleanup mini-toolbar: */
     cleanupMiniToolbar();
 #endif /* !Q_WS_MAC */
@@ -207 +210 @@
             if (pSeamlessLogic->hasHostScreenForGuestScreen(m_uScreenId))
             {
-                /* Show manually maximized window: */
+                /* Make sure the window is maximized and placed on valid screen: */
                 placeOnScreen();
 
-                /* Show normal window: */
+                /* Show in normal mode: */
                 show();
-
-#ifdef Q_WS_MAC
-                /* Make sure it is really on the right place (especially on the Mac): */
-                QRect r = vboxGlobal().availableGeometry(qobject_cast<UIMachineLogicSeamless*>(machineLogic())->hostScreenForGuestScreen(m_uScreenId));
-                move(r.topLeft());
-#endif /* Q_WS_MAC */
 
                 /* Return early: */
@@ -254 +251 @@
 }
 #endif /* !Q_WS_MAC */
-
-#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 UIMachineWindow::event(pEvent);
-}
-#endif /* Q_WS_MAC */
 
 #ifdef Q_WS_WIN

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

@@ -74 +74 @@
 #endif /* !Q_WS_MAC */
 
-#ifdef Q_WS_MAC
-    /* Event handlers: */
-    bool event(QEvent *pEvent);
-#endif /* Q_WS_MAC */
-
 #ifdef Q_WS_WIN
     /* Handler: Translucency stuff: */