VirtualBox

Timestamp:

Jul 20, 2015 10:08:34 AM (10 years ago)

Author:

vboxsync

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

101733

Message:

FE/Qt: 5978: Mini-toolbar: Use the common tool window flags for all hosts.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

trunk/src/VBox/Frontends/VirtualBox/src/globals/VBoxGlobal.cpp

-              r56932
+              r57015
                          pPropWidget->window()->winId());
+}
-/* static */
-void VBoxGlobal::representAsToolbar(QWidget *pWidget)
+{
-    /* Get display: */
-    Display *pDisplay = pWidget->x11Info().display();
-    /* Prepare a name of the property as the key: */
-    Atom net_wm_window_type = XInternAtom(pDisplay, "_NET_WM_WINDOW_TYPE", false);
-    /* Prepare a type of the property as the value: */
-    Atom net_wm_window_type_toolbar = XInternAtom(pDisplay, "_NET_WM_WINDOW_TYPE_TOOLBAR", false);
-    /* Populate values array: */
-    long data[1];
-    data[0] = net_wm_window_type_toolbar;
-    /* Assign the property for the passed widget: */
-    XChangeProperty(pWidget->x11Info().display(),
-                    pWidget->window()->winId(),
-                    net_wm_window_type, XA_ATOM, 32,
-                    PropModeReplace, (unsigned char*)&data, 1L);
+}
 #endif /* Q_WS_X11 */

r56932	r57015
363	363	/** X11: Ensures @a pPropWidget become transient for the @a pWidget. */
364	364	static void setTransientFor(QWidget pWidget, QWidget pPropWidget);
365		~~/** X11: Represents @a pWidget as X11 tool-bar. */~~
366		~~static void representAsToolbar(QWidget *pWidget);~~
367	365	#endif /* Q_WS_X11 */
368	366

-              r56935
+              r57015
                                            Qt::Alignment alignment,
                                            bool fAutoHide /* = true */)
+    : QWidget(pParent,
+#if   defined(Q_WS_WIN)
+              Qt::Tool | Qt::WindowStaysOnTopHint | Qt::FramelessWindowHint
+#elif defined(Q_WS_MAC) || defined(Q_WS_X11)
+              Qt::Window | Qt::FramelessWindowHint
+#endif /* Q_WS_MAC || Q_WS_X11 */
+              )
+    : QWidget(pParent, Qt::Tool | Qt::FramelessWindowHint)
     /* Variables: General stuff: */
     , m_geometryType(geometryType)
 …
     if (QX11Info::isCompositingManagerRunning())
         setAttribute(Qt::WA_TranslucentBackground);
-#endif /* Q_WS_X11 */
-#ifdef Q_WS_X11
-    /* Certain WMs requires some X11 magic
-     * to make tool-bar be always-on-top
-     * of corresponding machine-window. */
-    switch (vboxGlobal().typeOfWindowManager())
+    {
-        case X11WMType_Mutter:
-        case X11WMType_GnomeShell:
-            VBoxGlobal::representAsToolbar(this);
-            break;
-        default:
-            break;
+    }
 #endif /* Q_WS_X11 */

Note: See TracChangeset for help on using the changeset viewer.