Changeset 65549 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 31, 2017 4:11:24 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: X11: Runtime UI: Mini-toolbar: Remove the Unity full-screen workaround since it will not be necessary anymore.

Location:

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

Files:

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

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

@@ -401 +401 @@
 *********************************************************************************************************************************/
 
-/* static */
-Qt::WindowFlags UIMiniToolBar::defaultWindowFlags(GeometryType geometryType)
-{
-    /* Not everywhere: */
-    Q_UNUSED(geometryType);
-
-#ifdef VBOX_WS_X11
-    /* Depending on current WM: */
-    switch (vboxGlobal().typeOfWindowManager())
-    {
-        // 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;
-    }
-#endif /* VBOX_WS_X11 */
-
-    /* Frameless tool window by default: */
-    return Qt::Tool | Qt::FramelessWindowHint;
-}
-
 UIMiniToolBar::UIMiniToolBar(QWidget *pParent,
                              GeometryType geometryType,
                              Qt::Alignment alignment,
                              bool fAutoHide /* = true */)
-    : QWidget(pParent, defaultWindowFlags(geometryType))
+    : QWidget(pParent, Qt::Tool | Qt::FramelessWindowHint)
     /* Variables: General stuff: */
     , m_pParent(pParent)

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

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