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

Timestamp:

Jan 28, 2019 6:14:00 PM (6 years ago)

Author:

vboxsync

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

128453

Message:

FE/Qt: bugref:9241: VirtualBox Manager UI: Chooser pane: More wise layout fix for group enter/exit animation (replacing r128286).

Location:

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

Files:

• UIChooserItemGlobal.cpp (modified) (3 diffs)
• UIChooserItemGlobal.h (modified) (1 diff)
• UIChooserModel.cpp (modified) (5 diffs)
• UIChooserModel.h (modified) (1 diff)

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

@@ -67 +67 @@
 
 UIChooserItemGlobal::UIChooserItemGlobal(UIChooserItem *pParent,
-                                         UIChooserItemGlobal * ,
+                                         UIChooserItemGlobal *pCopyFrom,
                                          int iPosition /* = -1 */)
     : UIChooserItem(pParent, pParent->isTemporary(), 0, 100)
@@ -78 +78 @@
     , m_iMinimumNameWidth(0)
     , m_iMaximumNameWidth(0)
+    , m_iHeightHint(pCopyFrom->heightHint())
 {
     /* Prepare: */
@@ -149 +150 @@
     updateGeometry();
     model()->updateLayout();
+}
+
+int UIChooserItemGlobal::heightHint() const
+{
+    return m_iHeightHint;
 }
 

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

@@ -59 +59 @@
         /** Defines height @a iHint. */
         void setHeightHint(int iHint);
+        /** Returns height hint. */
+        int heightHint() const;
     /** @} */
 

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

@@ -79 +79 @@
     , m_fIsScrollingInProgress(false)
     , m_pLookupTimer(0)
-    , m_iGlobalItemHeightHint(-1)
 {
     /* Prepare: */
@@ -472 +471 @@
     m_pLeftRoot->setPos(0, 0);
     m_pLeftRoot->resize(root()->geometry().size());
-    if (fLeftRootIsMain)
-    {
-        foreach (UIChooserItem *pItem, m_pLeftRoot->items(UIChooserItemType_Global))
-            pItem->toGlobalItem()->setHeightHint(m_iGlobalItemHeightHint);
-    }
 
     /* Create right root: */
@@ -513 +507 @@
     m_pLeftRoot->setPos(- root()->geometry().width(), 0);
     m_pLeftRoot->resize(root()->geometry().size());
-    if (fLeftRootIsMain)
-    {
-        foreach (UIChooserItem *pItem, m_pLeftRoot->items(UIChooserItemType_Global))
-            pItem->toGlobalItem()->setHeightHint(m_iGlobalItemHeightHint);
-    }
 
     /* Create right root: */
@@ -685 +674 @@
 void UIChooserModel::setGlobalItemHeightHint(int iHint)
 {
-    /* Remember new hint: */
-    m_iGlobalItemHeightHint = iHint;
-
     /* Walk thrugh all the items of navigation list: */
     foreach (UIChooserItem *pItem, navigationList())
@@ -697 +683 @@
             UIChooserItemGlobal *pGlobalItem = pItem->toGlobalItem();
             if (pGlobalItem)
-                pGlobalItem->setHeightHint(m_iGlobalItemHeightHint);
+                pGlobalItem->setHeightHint(iHint);
         }
     }

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

@@ -523 +523 @@
         /** Holds the Id of last VM created from the GUI side. */
         QUuid  m_uLastCreatedMachineId;
-
-        /** Holds the global item height hint. */
-        int  m_iGlobalItemHeightHint;
     /** @} */