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

Timestamp:

Jan 31, 2017 4:38:19 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: Runtime UI: Mini-toolbar: Restore the mini-toolbar z-order according to it's parent, required after r113198.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIMiniToolBar.cpp (modified) (3 diffs)

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

@@ -30 +30 @@
 # include <QStateMachine>
 # include <QPainter>
-# ifdef VBOX_WS_WIN
-#  include <QWindow>
-# endif /* VBOX_WS_WIN */
+# include <QWindow>
 # ifdef VBOX_WS_X11
 #  include <QWindowStateChangeEvent>
@@ -590 +588 @@
     LogRel2(("GUI: UIMiniToolBar::sltShow\n"));
 
+    /* Update transience: */
+    sltAdjustTransience();
+
 #if defined(VBOX_WS_MAC)
 
@@ -775 +776 @@
 
 #endif
+}
+
+void UIMiniToolBar::sltAdjustTransience()
+{
+    // WORKAROUND:
+    // Make sure win id is generated,
+    // else Qt5 can crash otherwise.
+    winId();
+    m_pParent->winId();
+
+    /* Add the transience dependency: */
+    windowHandle()->setTransientParent(m_pParent->windowHandle());
 }