Changeset 52868 in vbox for trunk/src/VBox

Timestamp:

Sep 26, 2014 12:38:53 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: X11: Mini-toolbar: Shape should be enabled only if composition enabled.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp

@@ -31 +31 @@
 # include <QStateMachine>
 # include <QPainter>
+# ifdef Q_WS_X11
+#  include <QX11Info>
+# endif /* Q_WS_X11 */
 
 /* GUI includes: */
@@ -39 +42 @@
 # ifdef Q_WS_MAC
 #  include "VBoxUtils-darwin.h"
-# endif
+# endif /* Q_WS_MAC */
 
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
@@ -570 +573 @@
 
     /* Left margin: */
+#ifdef Q_WS_X11
+    if (QX11Info::isCompositingManagerRunning())
+        m_spacings << widgetForAction(addWidget(new QWidget));
+#else /* !Q_WS_X11 */
     m_spacings << widgetForAction(addWidget(new QWidget));
+#endif /* !Q_WS_X11 */
 
     /* Prepare push-pin: */
@@ -622 +630 @@
 
     /* Right margin: */
+#ifdef Q_WS_X11
+    if (QX11Info::isCompositingManagerRunning())
+        m_spacings << widgetForAction(addWidget(new QWidget));
+#else /* !Q_WS_X11 */
     m_spacings << widgetForAction(addWidget(new QWidget));
+#endif /* !Q_WS_X11 */
 
     /* Resize to sizehint: */
@@ -630 +643 @@
 void UIMiniToolBar::rebuildShape()
 {
+#ifdef Q_WS_X11
+    if (!QX11Info::isCompositingManagerRunning())
+        return;
+#endif /* Q_WS_X11 */
+
     /* Rebuild shape: */
     QPainterPath shape;