Changeset 59819 in vbox

Timestamp:

Feb 25, 2016 6:24:12 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Qt5 migration (part 99): Mac OS X: Translucency fixes for Qt5: 1. Attribute now must be set first before any sub-widget which propagates own background, 2. Composition rules for Mac OS X were finally synchronized with other hosts.

Location:

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

Files:

• UIFrameBuffer.cpp (modified) (1 diff)
• UIMachineWindow.cpp (modified) (1 diff)
• seamless/UIMachineWindowSeamless.cpp (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBuffer.cpp

@@ -1459 +1459 @@
     /* Set composition-mode to paint: */
     painter.setCompositionMode(QPainter::CompositionMode_SourceOver);
+
 #if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS)
-# if defined(Q_WS_WIN) || defined(Q_WS_X11)
+# if defined(Q_WS_WIN) || defined(Q_WS_X11) || QT_VERSION >= 0x050000
     /* Replace translucent background with black one: */
     painter.setCompositionMode(QPainter::CompositionMode_Source);
     painter.fillRect(paintRect, QColor(Qt::black));
     painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
-# endif /* Q_WS_WIN || Q_WS_X11 */
+# endif /* Q_WS_WIN || Q_WS_X11 || QT_VERSION >= 0x050000 */
 #endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS */
-    /* Paint rectangle: */
+
+    /* Draw image rectangle: */
     drawImageRect(painter, sourceImage, paintRect,
                   m_pMachineView->contentsX(), m_pMachineView->contentsY(),

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachineWindow.cpp

@@ -115 +115 @@
     prepareStatusBar();
 
+    /* Prepare visual-state: */
+    prepareVisualState();
+
     /* Prepare machine-view: */
     prepareMachineView();
-
-    /* Prepare visual-state: */
-    prepareVisualState();
 
     /* Prepare handlers: */

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

@@ -87 +87 @@
 
 #ifdef VBOX_WITH_TRANSLUCENT_SEAMLESS
-# ifdef Q_WS_MAC
+# if defined(Q_WS_MAC) && QT_VERSION < 0x050000
     /* Using native API to enable translucent background for the Mac host.
      * - We also want to disable window-shadows which is possible
@@ -93 +93 @@
      *   while minimum supported version is 4.7.1 for now: */
     ::darwinSetShowsWindowTransparent(this, true);
-# else /* Q_WS_MAC */
+# else /* !Q_WS_MAC || QT_VERSION >= 0x050000 */
     /* Using Qt API to enable translucent background:
      * - Under Win host Qt conflicts with 3D stuff (black seamless regions).
@@ -99 +99 @@
      *   until version 4.8, but minimum supported version is 4.7.1 for now. */
     setAttribute(Qt::WA_TranslucentBackground);
-# endif /* !Q_WS_MAC */
+# endif /* !Q_WS_MAC || QT_VERSION >= 0x050000 */
 #endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS */