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

Timestamp:

Dec 7, 2012 1:43:35 PM (12 years ago)

Author:

vboxsync

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

82546

Message:

FE/Qt: VM group UI: Details-view: More wise geometry update mechanism.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details

Files:

• UIGDetailsElement.cpp (modified) (6 diffs)
• UIGDetailsGroup.cpp (modified) (1 diff)
• UIGDetailsItem.cpp (modified) (1 diff)
• UIGDetailsItem.h (modified) (1 diff)
• UIGDetailsSet.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsElement.cpp

@@ -103 +103 @@
     /* Mark animation as non-running: */
     m_fAnimationRunning = false;
+
+    /* Recursively update size-hint: */
+    updateGeometry();
+    /* Repaint: */
+    update();
 }
 
@@ -189 +194 @@
 
     /* Calculate minimum-text-width: */
-    m_iMinimumTextWidth = 0;
+    int iMinimumTextWidth = 0;
     if (fSingleColumnText)
     {
         /* Take into account only left column: */
         int iMinimumLeftColumnWidth = qMin(iMaximumLeftLineWidth, iMinimumTextColumnWidth);
-        m_iMinimumTextWidth = iMinimumLeftColumnWidth;
+        iMinimumTextWidth = iMinimumLeftColumnWidth;
     }
     else
@@ -201 +206 @@
         int iMinimumLeftColumnWidth = iMaximumLeftLineWidth;
         int iMinimumRightColumnWidth = qMin(iMaximumRightLineWidth, iMinimumTextColumnWidth);
-        m_iMinimumTextWidth = iMinimumLeftColumnWidth + iSpacing + iMinimumRightColumnWidth;
+        iMinimumTextWidth = iMinimumLeftColumnWidth + iSpacing + iMinimumRightColumnWidth;
+    }
+
+    /* Is there something changed? */
+    if (m_iMinimumTextWidth != iMinimumTextWidth)
+    {
+        /* Remember new value: */
+        m_iMinimumTextWidth = iMinimumTextWidth;
+        /* Recursively update size-hint: */
+        updateGeometry();
     }
 }
@@ -248 +262 @@
 
     /* Calculate minimum-text-height: */
-    m_iMinimumTextHeight = 0;
+    int iMinimumTextHeight = 0;
     foreach (const UITextTableLine line, m_text)
     {
@@ -272 +286 @@
 
         /* Append summary text height: */
-        m_iMinimumTextHeight += qMax(iLeftColumnHeight, iRightColumnHeight);
+        iMinimumTextHeight += qMax(iLeftColumnHeight, iRightColumnHeight);
+    }
+
+    /* Is there something changed? */
+    if (m_iMinimumTextHeight != iMinimumTextHeight)
+    {
+        /* Remember new value: */
+        m_iMinimumTextHeight = iMinimumTextHeight;
+        /* Recursively update size-hint: */
+        updateGeometry();
     }
 }
@@ -382 +405 @@
 void UIGDetailsElement::updateLayout()
 {
-    /* Update size-hint: */
-    updateSizeHint();
-
     /* Prepare variables: */
     QSize size = geometry().size().toSize();

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsGroup.cpp

@@ -235 +235 @@
 void UIGDetailsGroup::updateLayout()
 {
-    /* Update size-hints for all the children: */
-    foreach (UIGDetailsItem *pItem, items())
-        pItem->updateSizeHint();
-    /* Update size-hint for this item: */
-    updateSizeHint();
-
     /* Prepare variables: */
     int iMargin = data(GroupData_Margin).toInt();

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.cpp

@@ -85 +85 @@
 }
 
-void UIGDetailsItem::updateSizeHint()
+void UIGDetailsItem::updateGeometry()
 {
-    /* Update the geometry: */
-    updateGeometry();
+    /* Call to base-class: */
+    QIGraphicsWidget::updateGeometry();
+
+    /* Do the same for the parent: */
+    if (parentItem())
+        parentItem()->updateGeometry();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsItem.h

@@ -77 +77 @@
 
     /* API: Layout stuff: */
-    void updateSizeHint();
+    void updateGeometry();
     virtual int minimumWidthHint() const = 0;
     virtual int minimumHeightHint() const = 0;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

@@ -124 +124 @@
             /* Show the element: */
             pElement->show();
+            /* Recursively update size-hint: */
+            pElement->updateGeometry();
             /* Update layout: */
             model()->updateLayout();
@@ -132 +134 @@
             /* Hide the element: */
             pElement->hide();
+            /* Recursively update size-hint: */
+            updateGeometry();
             /* Update layout: */
             model()->updateLayout();
@@ -435 +439 @@
 void UIGDetailsSet::updateLayout()
 {
-    /* Update size-hints for all the items: */
-    foreach (UIGDetailsItem *pItem, items())
-        pItem->updateSizeHint();
-    /* Update size-hint for this item: */
-    updateSizeHint();
-
     /* Prepare variables: */
     int iMargin = data(SetData_Margin).toInt();
@@ -474 +472 @@
                 /* Move element: */
                 pElement->setPos(iMargin, iVerticalIndent);
-                /* Resize element to required width: */
+                /* Calculate required width: */
                 int iWidth = iMaximumWidth - 2 * iMargin;
                 if (pElement->elementType() == DetailsElementType_General ||
@@ -481 +479 @@
                         if (pPreviewElement->isVisible())
                             iWidth -= (iSpacing + pPreviewElement->minimumWidthHint());
+                /* If element width is wrong: */
+                if (pElement->geometry().width() != iWidth)
+                {
+                    /* Resize element to required width: */
+                    pElement->resize(iWidth, pElement->geometry().height());
+                    /* Update minimum-height-hint: */
+                    pElement->updateMinimumTextHeight();
+                }
+                /* Acquire required height: */
                 int iHeight = pElement->minimumHeightHint();
-                pElement->resize(iWidth, iHeight);
-                /* Update minimum-height-hint: */
-                pElement->updateMinimumTextHeight();
-                pItem->updateSizeHint();
-                /* Resize element to required height: */
-                iHeight = pElement->minimumHeightHint();
-                pElement->resize(iWidth, iHeight);
+                /* If element height is wrong: */
+                if (pElement->geometry().height() != iHeight)
+                {
+                    /* Resize element to required height: */
+                    pElement->resize(pElement->geometry().width(), iHeight);
+                }
                 /* Layout element content: */
                 pItem->updateLayout();