Changeset 64643 in vbox for trunk

Timestamp:

Nov 10, 2016 4:02:59 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:5978: X11: Disable Unity/Compiz workaround for UIMiniToolBar in case of seamless geometry is used, but still use for full-screen geometry. With Qt 5.6.1 that caused regression.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/widgets

Files:

• UIMiniToolBar.cpp (modified) (2 diffs)
• UIMiniToolBar.h (modified) (1 diff)

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

@@ -391 +391 @@
 
 /* static */
-Qt::WindowFlags UIMiniToolBar::defaultWindowFlags()
-{
+Qt::WindowFlags UIMiniToolBar::defaultWindowFlags(GeometryType geometryType)
+{
+    /* Not everywhere: */
+    Q_UNUSED(geometryType);
+
 #ifdef VBOX_WS_X11
     /* Depending on current WM: */
     switch (vboxGlobal().typeOfWindowManager())
     {
-        /* Frameless top-level window for Unity, issues with tool window there.. */
-        case X11WMType_Compiz: return Qt::Window | Qt::FramelessWindowHint;
+        // WORKAROUND:
+        // Frameless top-level window for Unity(Compiz) full-screen mode,
+        // otherwise we have Unity panel and menu-bar visible in full-screen mode.
+        // Frameless top-level tool-window for Unity(Compiz) seamless mode,
+        // otherwise we have Unity panel and menu-bar hidden in seamless mode.
+        case X11WMType_Compiz: return geometryType == GeometryType_Full ?
+                                      Qt::Window | Qt::FramelessWindowHint :
+                                      Qt::Tool | Qt::FramelessWindowHint;
         default: break;
     }
@@ -411 +420 @@
                              Qt::Alignment alignment,
                              bool fAutoHide /* = true */)
-    : QWidget(pParent, defaultWindowFlags())
+    : QWidget(pParent, defaultWindowFlags(geometryType))
     /* Variables: General stuff: */
     , m_geometryType(geometryType)

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

@@ -67 +67 @@
 
     /** Proposes default set of window flags for particular platform. */
-    static Qt::WindowFlags defaultWindowFlags();
+    static Qt::WindowFlags defaultWindowFlags(GeometryType geometryType);
 
     /** Constructor, passes @a pParent to the QWidget constructor.