Changeset 48705 in vbox for trunk

Timestamp:

Sep 26, 2013 12:20:47 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

89333

Message:

FE/Qt: Runtime UI: Moving *translucent seamless* feature under #ifdef (enabled only on MacOS X host currently).

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• Makefile.kmk (modified) (1 diff)
• src/runtime/UIFrameBuffer.cpp (modified) (2 diffs)
• src/runtime/UIFrameBufferQImage.cpp (modified) (2 diffs)
• src/runtime/UIMachineWindow.h (modified) (1 diff)
• src/runtime/seamless/UIMachineWindowSeamless.cpp (modified) (5 diffs)
• src/runtime/seamless/UIMachineWindowSeamless.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/Makefile.kmk

@@ -80 +80 @@
 VirtualBox_DEFS           =
 VirtualBox_DEFS.debug     = VBOX_CHECK_STATE # QT_FATAL_ASSERT
-VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_QUARTZ2D
+VirtualBox_DEFS.darwin    = VBOX_GUI_USE_QIMAGE VBOX_GUI_USE_QUARTZ2D VBOX_WITH_TRANSLUCENT_SEAMLESS
 VirtualBox_DEFS.freebsd   = VBOX_GUI_USE_QIMAGE
 VirtualBox_DEFS.linux     = VBOX_GUI_USE_QIMAGE

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

@@ -27 +27 @@
 # include "UIMessageCenter.h"
 # include "VBoxGlobal.h"
-# ifdef Q_WS_X11
+# ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
 #  include "UIMachineWindow.h"
-# endif /* Q_WS_X11 */
+# endif /* !VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
 /* Other VBox includes: */
@@ -375 +375 @@
     m_asyncVisibleRegion = region;
 
-#ifdef Q_WS_X11
-    /* Qt 4.8.3 under X11 has Qt::WA_TranslucentBackground window attribute broken,
-     * so we are also have to use async visible-region to apply to [Q]Widget [set]Mask
-     * which internally wraps old one known (approved) Xshape extension: */
+#ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
+    /* We have to use async visible-region to apply to [Q]Widget [set]Mask: */
     m_pMachineView->machineWindow()->setMask(m_asyncVisibleRegion);
-#endif /* Q_WS_X11 */
+#endif /* !VBOX_WITH_TRANSLUCENT_SEAMLESS */
 }
 

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

@@ -250 +250 @@
         foreach (const QRect &rect, regionToPaint.rects())
         {
-#ifdef Q_WS_WIN
+#if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS) && defined(Q_WS_WIN)
             /* Replace translucent background with black one,
              * that is necessary for window with Qt::WA_TranslucentBackground: */
@@ -256 +256 @@
             painter.fillRect(rect, QColor(Qt::black));
             painter.setCompositionMode(QPainter::CompositionMode_SourceAtop);
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS && Q_WS_WIN */
 
             /* Draw image rectangle depending on rectangle width: */

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

@@ -62 +62 @@
     CMachine machine() const;
 
+#ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
     /* Virtual caller for base class setMask: */
     virtual void setMask(const QRegion &region);
+#endif /* !VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
 protected slots:

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

@@ -92 +92 @@
     setAttribute(Qt::WA_NoSystemBackground);
 
-#ifdef Q_WS_WIN
-    /* 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
+#ifdef VBOX_WITH_TRANSLUCENT_SEAMLESS
+# ifdef Q_WS_MAC
     /* Using native API to enable translucent background for the Mac host.
      * - We also want to disable window-shadows which is possible
@@ -106 +99 @@
      *   while minimum supported version is 4.7.1 for now: */
     ::darwinSetShowsWindowTransparent(this, true);
-#endif /* Q_WS_MAC */
+# else /* Q_WS_MAC */
+    /* Using Qt API to enable translucent background:
+     * - Under Win host Qt conflicts with 3D stuff (black seamless regions).
+     * - 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 has it broken with KDE 4.9 (black background): */
+    setAttribute(Qt::WA_TranslucentBackground);
+# endif /* !Q_WS_MAC */
+#endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
 #ifndef Q_WS_MAC
@@ -258 +259 @@
 #endif /* !Q_WS_MAC */
 
-#ifdef Q_WS_WIN
+#if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS) && defined(Q_WS_WIN)
 void UIMachineWindowSeamless::showEvent(QShowEvent*)
 {
@@ -268 +269 @@
     QApplication::postEvent(this, new QEvent(QEvent::UpdateRequest), Qt::LowEventPriority);
 }
-#endif /* Q_WS_WIN */
-
-#ifdef Q_WS_X11
+#endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS && Q_WS_WIN */
+
+#ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
 void UIMachineWindowSeamless::setMask(const QRegion &region)
 {
@@ -303 +304 @@
     }
 }
-#endif /* Q_WS_X11 */
-
+#endif /* !VBOX_WITH_TRANSLUCENT_SEAMLESS */
+

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

@@ -74 +74 @@
 #endif /* !Q_WS_MAC */
 
-#ifdef Q_WS_WIN
+#if defined(VBOX_WITH_TRANSLUCENT_SEAMLESS) && defined(Q_WS_WIN)
     /* Handler: Translucency stuff: */
     void showEvent(QShowEvent *pEvent);
-#endif /* Q_WS_WIN */
+#endif /* VBOX_WITH_TRANSLUCENT_SEAMLESS && Q_WS_WIN */
 
-#ifdef Q_WS_X11
+#ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
     /* Helper: Masking stuff: */
     void setMask(const QRegion &region);
-#endif /* Q_WS_X11 */
+#endif /* !VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
     /* Widgets: */
@@ -90 +90 @@
 #endif /* !Q_WS_MAC */
 
-#ifdef Q_WS_X11
+#ifndef VBOX_WITH_TRANSLUCENT_SEAMLESS
     /* Variable: Masking stuff: */
     QRegion m_maskRegion;
-#endif /* Q_WS_X11 */
+#endif /* !VBOX_WITH_TRANSLUCENT_SEAMLESS */
 
     /* Factory support: */