Changeset 57045 in vbox for trunk/src/VBox

Timestamp:

Jul 21, 2015 4:20:28 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Mini-toolbar transience support: No need for native flags since r101733.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (1 diff)
• runtime/seamless/UIMachineWindowSeamless.cpp (modified) (1 diff)

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

@@ -3319 +3319 @@
                                1 /* Source indication (1 = normal application) */);
 }
-
-/* static */
-void VBoxGlobal::setTransientFor(QWidget *pWidget, QWidget *pPropWidget)
-{
-    XSetTransientForHint(pWidget->x11Info().display(),
-                         pWidget->window()->winId(),
-                         pPropWidget->window()->winId());
-}
 #endif /* Q_WS_X11 */
 

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

@@ -361 +361 @@
     /** X11: Performs mapping of the passed @a pWidget to host-screen with passed @a uScreenId. */
     static bool setFullScreenMonitorX11(QWidget *pWidget, ulong uScreenId);
-    /** X11: Ensures @a pPropWidget become transient for the @a pWidget. */
-    static void setTransientFor(QWidget *pWidget, QWidget *pPropWidget);
 #endif /* Q_WS_X11 */
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -249 +249 @@
     AssertPtrReturnVoid(m_pMiniToolBar);
     {
-#ifdef Q_WS_X11
-        /* Make sure mini-toolbar is always-on-top of machine-window: */
-        VBoxGlobal::setTransientFor(m_pMiniToolBar, this);
-#endif /* Q_WS_X11 */
         /* Configure mini-toolbar: */
         m_pMiniToolBar->addMenus(actionPool()->menus());

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -131 +131 @@
     AssertPtrReturnVoid(m_pMiniToolBar);
     {
-#ifdef Q_WS_X11
-        /* Make sure mini-toolbar is always-on-top of machine-window: */
-        VBoxGlobal::setTransientFor(m_pMiniToolBar, this);
-#endif /* Q_WS_X11 */
         /* Configure mini-toolbar: */
         m_pMiniToolBar->addMenus(actionPool()->menus());