Changeset 77829 in vbox

Timestamp:

Mar 21, 2019 3:55:55 PM (6 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9241: VirtualBox Manager: Chooser pane: Fixing layout hint update regression indirectly introduced in r129266.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser

Files:

• UIChooserItem.cpp (modified) (2 diffs)
• UIChooserItem.h (modified) (2 diffs)
• UIChooserItemGroup.cpp (modified) (4 diffs)
• UIChooserItemGroup.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.cpp

@@ -231 +231 @@
     , m_iAnimatedValue(m_iDefaultValue)
     , m_pDisabledEffect(0)
-    , m_iPreviousMinimumWidthHint(0)
     , m_enmDragTokenPlace(UIChooserItemDragToken_Off)
     , m_iDragTokenDarkness(110)
@@ -423 +422 @@
     if (parentItem())
         parentItem()->updateGeometry();
-
-    /* Special handling for root-items: */
-    if (isRoot())
-    {
-        /* Root-item should notify chooser-view if minimum-width-hint was changed: */
-        const int iMinimumWidthHint = minimumWidthHint();
-        if (m_iPreviousMinimumWidthHint != iMinimumWidthHint)
-        {
-            /* Save new minimum-width-hint, notify listener: */
-            m_iPreviousMinimumWidthHint = iMinimumWidthHint;
-            emit sigMinimumWidthHintChanged(m_iPreviousMinimumWidthHint);
-        }
-    }
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItem.h

@@ -81 +81 @@
         /** Notifies listeners about hover leave. */
         void sigHoverLeave();
-    /** @} */
-
-    /** @name Layout stuff.
-      * @{ */
-        /** Notifies listeners about @a iMinimumWidthHint change. */
-        void sigMinimumWidthHintChanged(int iMinimumWidthHint);
     /** @} */
 
@@ -341 +335 @@
         /** Holds previous geometry. */
         QRectF  m_previousGeometry;
-
-        /** Holds previous minimum width hint. */
-        int  m_iPreviousMinimumWidthHint;
     /** @} */
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.cpp

@@ -61 +61 @@
     , m_pLayoutGroup(0)
     , m_pLayoutMachine(0)
+    , m_iPreviousMinimumWidthHint(0)
 {
     prepare();
@@ -82 +83 @@
     , m_pLayoutGroup(0)
     , m_pLayoutMachine(0)
+    , m_iPreviousMinimumWidthHint(0)
 {
     prepare();
@@ -568 +570 @@
     /* Call to base-class: */
     UIChooserItem::updateGeometry();
+
+    /* Special handling for root-groups: */
+    if (isRoot())
+    {
+        /* Root-group should notify chooser-view if minimum-width-hint was changed: */
+        const int iMinimumWidthHint = minimumWidthHint();
+        if (m_iPreviousMinimumWidthHint != iMinimumWidthHint)
+        {
+            /* Save new minimum-width-hint, notify listener: */
+            m_iPreviousMinimumWidthHint = iMinimumWidthHint;
+            emit sigMinimumWidthHintChanged(m_iPreviousMinimumWidthHint);
+        }
+    }
 }
 
@@ -1188 +1203 @@
                 this, &UIChooserItemGroup::sltHandleWindowRemapped);
     }
+
+    /* Invalidate minimum width hint
+     * after we isntalled listener: */
+    m_iPreviousMinimumWidthHint = 0;
+    /* Update geometry finally: */
+    updateGeometry();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/chooser/UIChooserItemGroup.h

@@ -51 +51 @@
     /** @} */
 
+    /** @name Layout stuff.
+      * @{ */
+        /** Notifies listeners about @a iMinimumWidthHint change. */
+        void sigMinimumWidthHintChanged(int iMinimumWidthHint);
+    /** @} */
+
 public:
 
@@ -363 +369 @@
     /** @name Layout stuff.
       * @{ */
+        /** Holds previous minimum width hint. */
+        int  m_iPreviousMinimumWidthHint;
+
         /** Holds cached visible name size. */
         QSize  m_visibleNameSize;