Changeset 65547 in vbox for trunk/src/VBox/Frontends

Timestamp:

Jan 31, 2017 4:00:02 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:8636: Runtime UI: Mini-toolbar: Store parent separately to get rid of unwanted dependency.

Location:

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

Files:

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

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

@@ -134 +134 @@
     QList<QWidget*> m_margins;
 };
+
+
+/*********************************************************************************************************************************
+*   Class UIMiniToolBarPrivate implementation.                                                                                   *
+*********************************************************************************************************************************/
 
 UIMiniToolBarPrivate::UIMiniToolBarPrivate()
@@ -391 +396 @@
 }
 
+
+/*********************************************************************************************************************************
+*   Class UIMiniToolBar implementation.                                                                                          *
+*********************************************************************************************************************************/
+
 /* static */
 Qt::WindowFlags UIMiniToolBar::defaultWindowFlags(GeometryType geometryType)
@@ -423 +433 @@
     : QWidget(pParent, defaultWindowFlags(geometryType))
     /* Variables: General stuff: */
+    , m_pParent(pParent)
     , m_geometryType(geometryType)
     , m_alignment(alignment)
@@ -646 +657 @@
 
     /* Get corresponding host-screen: */
-    const int iHostScreen = gpDesktop->screenNumber(parentWidget());
+    const int iHostScreen = gpDesktop->screenNumber(m_pParent);
     Q_UNUSED(iHostScreen);
     /* And corresponding working area: */
@@ -735 +746 @@
     /* Install event-filters: */
     installEventFilter(this);
-    parent()->installEventFilter(this);
+    m_pParent->installEventFilter(this);
 
 #if   defined(VBOX_WS_WIN)
@@ -942 +953 @@
 
     /* If that's parent window event: */
-    if (pWatched == parent())
+    if (pWatched == m_pParent)
     {
         switch (pEvent->type())
@@ -974 +985 @@
             {
                 /* Skip if parent or we are invisible: */
-                if (   !parentWidget()->isVisible()
+                if (   !m_pParent->isVisible()
                     || !isVisible())
                     break;
@@ -1003 +1014 @@
                 QWindowStateChangeEvent *pChangeEvent = static_cast<QWindowStateChangeEvent*>(pEvent);
                 LogRel2(("GUI: UIMiniToolBar::eventFilter: Parent window state changed from %d to %d\n",
-                         (int)pChangeEvent->oldState(), (int)parentWidget()->windowState()));
-                if (parentWidget()->windowState() & Qt::WindowMinimized)
+                         (int)pChangeEvent->oldState(), (int)m_pParent->windowState()));
+                if (m_pParent->windowState() & Qt::WindowMinimized)
                 {
                     /* Mark parent window minimized, isMinimized() is not enough due to Qt5vsX11 fight: */
@@ -1011 +1022 @@
                 }
                 else
-                if (parentWidget()->windowState() == Qt::WindowFullScreen)
+                if (m_pParent->windowState() == Qt::WindowFullScreen)
                 {
                     /* Mark parent window non-minimized, isMinimized() is not enough due to Qt5vsX11 fight: */
@@ -1067 +1078 @@
     return m_fIsParentMinimized;
 #else
-    return parentWidget()->isMinimized();
+    return m_pParent->isMinimized();
 #endif
 }

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

@@ -157 +157 @@
     bool isParentMinimized() const;
 
+    /** Holds the parent reference. */
+    QWidget *m_pParent;
+
     /** Holds the geometry type. */
     const GeometryType m_geometryType;