Changeset 56935 in vbox for trunk

Timestamp:

Jul 14, 2015 5:46:30 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: X11: 5978: Adjusting mini-toolbar z-order for GNOME Shell, same as in r101639.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• platform/x11/VBoxX11Helper.cpp (modified) (1 diff)
• platform/x11/VBoxX11Helper.h (modified) (1 diff)
• widgets/UIMiniToolBar.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.cpp

@@ -75 +75 @@
                 if (QString((const char*)pcData).contains("Mutter", Qt::CaseInsensitive))
                     wmType = X11WMType_Mutter;
+                else
+                if (QString((const char*)pcData).contains("GNOME Shell", Qt::CaseInsensitive))
+                    wmType = X11WMType_GnomeShell;
                 if (pcData)
                     XFree(pcData);

trunk/src/VBox/Frontends/VirtualBox/src/platform/x11/VBoxX11Helper.h

@@ -25 +25 @@
     X11WMType_KWin,
     X11WMType_Mutter,
+    X11WMType_GnomeShell,
 };
 

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

@@ -330 +330 @@
     {
         case X11WMType_Mutter:
+        case X11WMType_GnomeShell:
             VBoxGlobal::representAsToolbar(this);
             break;
@@ -502 +503 @@
     AssertPtrReturnVoid(m_pEmbeddedToolbar);
     m_pEmbeddedToolbar->move(point);
-
-#ifdef Q_WS_X11
-    /* Update window mask: */
-    setMask(m_pEmbeddedToolbar->geometry());
-#endif /* Q_WS_X11 */
 }