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

Timestamp:

Nov 26, 2012 8:46:58 AM (12 years ago)

Author:

vboxsync

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

82297

Message:

FE/Qt: VM group UI: Chooser-view: Machine-item layout management rework.

Location:

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

Files:

• UIGChooserItem.cpp (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (1 diff)
• UIGChooserItemGroup.h (modified) (1 diff)
• UIGChooserItemMachine.cpp (modified) (13 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItem.cpp

@@ -157 +157 @@
 void UIGChooserItem::updateGeometry()
 {
+    /* Call to base-class: */
     QIGraphicsWidget::updateGeometry();
+
+    /* Update parent's geometry: */
+    if (parentItem())
+        parentItem()->updateGeometry();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.cpp

@@ -930 +930 @@
 }
 
-void UIGChooserItemGroup::updateGeometry()
-{
-    /* Call to base-class: */
-    UIGChooserItem::updateGeometry();
-
-    /* Update parent's geometry: */
-    if (parentItem())
-        parentItem()->updateGeometry();
-}
-
 void UIGChooserItemGroup::updateLayout()
 {

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemGroup.h

@@ -146 +146 @@
 
     /* Helpers: Layout stuff: */
-    void updateGeometry();
     void updateLayout();
     int minimumWidthHint(bool fOpenedGroup) const;

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserItemMachine.cpp

@@ -208 +208 @@
     /* First row update required? */
     bool fFirstRowUpdateRequired = false;
+    bool fSecondRowUpdateRequired = false;
 
     /* Update pixmap: */
     QIcon icon = osIcon();
     QSize iconSize = icon.availableSizes().first();
-    m_pixmap = icon.pixmap(iconSize);
+    QPixmap pixmap = icon.pixmap(iconSize);
+    if (m_pixmap.toImage() != pixmap.toImage())
+    {
+        m_pixmap = pixmap;
+        update();
+    }
     if (m_pixmapSize != iconSize)
     {
@@ -223 +229 @@
     QSize stateIconSize = stateIcon.availableSizes().first();
     m_statePixmap = stateIcon.pixmap(stateIconSize);
+    QPixmap statePixmap = icon.pixmap(stateIconSize);
+    if (m_statePixmap.toImage() != statePixmap.toImage())
+    {
+        m_statePixmap = statePixmap;
+        update();
+    }
     if (m_statePixmapSize != stateIconSize)
     {
         m_statePixmapSize = stateIconSize;
+        fSecondRowUpdateRequired = true;
     }
 
     /* Update linked values: */
+    if (fFirstRowUpdateRequired || fSecondRowUpdateRequired)
+        updateGeometry();
     if (fFirstRowUpdateRequired)
         updateFirstRowMaximumWidth();
@@ -297 +312 @@
     QFontMetrics fm(m_nameFont, pPaintDevice);
     m_iMinimumNameWidth = fm.width(compressText(m_nameFont, pPaintDevice, m_strName, textWidth(m_nameFont, pPaintDevice, 15)));
+
+    /* Update linked values: */
+    updateGeometry();
 }
 
@@ -317 +335 @@
     }
 
-    /* Calculate linked values: */
+    /* Update linked values: */
+    updateGeometry();
     updateMaximumNameWidth();
 }
@@ -347 +366 @@
     m_strVisibleName = compressText(m_nameFont, pPaintDevice, m_strName, m_iMaximumNameWidth);
     m_visibleNameSize = textSize(m_nameFont, pPaintDevice, m_strVisibleName);
+
+    /* Update linked values: */
+    updateGeometry();
+    updateMaximumSnapshotNameWidth();
     update();
-
-    /* Update linked values: */
-    updateMaximumSnapshotNameWidth();
 }
 
@@ -364 +384 @@
     m_strVisibleSnapshotName = QString("(%1)").arg(strVisibleSnapshotName);
     m_visibleSnapshotNameSize = textSize(m_snapshotNameFont, pPaintDevice, m_strVisibleSnapshotName);
+
+    /* Update linked values: */
+    updateGeometry();
     update();
 }
@@ -369 +392 @@
 void UIGChooserItemMachine::updateStateText()
 {
+    /* Something changed? */
+    QString strStateText = machineStateName();
+    if (m_strStateText == strStateText)
+        return;
+
     /* Update state text: */
-    m_strStateText = machineStateName();
+    m_strStateText = strStateText;
     m_stateTextSize = textSize(m_stateTextFont, model()->paintDevice(), m_strStateText);
+
+    /* Update linked values: */
+    updateGeometry();
     update();
 }
@@ -439 +470 @@
     updateStateText();
     updateToolTip();
-    update();
 
     /* Update parent group-item: */
@@ -493 +523 @@
 void UIGChooserItemMachine::updateLayout()
 {
-    /* Update size-hint for this item: */
-    updateGeometry();
-
     /* Update tool-bar: */
     if (m_pToolBar)
@@ -529 +556 @@
     int iMachineItemMajorSpacing = data(MachineItemData_MajorSpacing).toInt();
     int iMachineItemMinorSpacing = data(MachineItemData_MinorSpacing).toInt();
-    int iMachinePixmapWidth = m_pixmapSize.width();
-    int iMachineStatePixmapWidth = m_statePixmapSize.width();
-    int iMachineStateTextWidth = m_stateTextSize.width();
     int iToolBarWidth = data(MachineItemData_ToolBarSize).toSize().width();
 
@@ -543 +567 @@
                         iMachineItemMinorSpacing +
                         m_iMinimumSnapshotNameWidth;
-    int iBottomLineWidth = iMachineStatePixmapWidth +
+    int iBottomLineWidth = m_statePixmapSize.width() +
                            iMachineItemMinorSpacing +
-                           iMachineStateTextWidth;
+                           m_stateTextSize.width();
     int iRightColumnWidth = qMax(iTopLineWidth, iBottomLineWidth);
-    int iMachineItemWidth = iMachinePixmapWidth +
+    int iMachineItemWidth = m_pixmapSize.width() +
                             iMachineItemMajorSpacing +
                             iRightColumnWidth;
@@ -563 +587 @@
     int iMachineItemMargin = data(MachineItemData_Margin).toInt();
     int iMachineItemTextSpacing = data(MachineItemData_TextSpacing).toInt();
-    int iMachinePixmapHeight = m_pixmapSize.height();
-    int iMachineNameHeight = m_visibleNameSize.height();
-    int iSnapshotNameHeight = m_visibleSnapshotNameSize.height();
-    int iMachineStatePixmapHeight = m_statePixmapSize.height();
-    int iMachineStateTextHeight = m_stateTextSize.height();
     int iToolBarHeight = data(MachineItemData_ToolBarSize).toSize().height();
 
@@ -576 +595 @@
     iProposedHeight += 2 * iMachineItemMargin;
     /* And machine-item content to take into account: */
-    int iTopLineHeight = qMax(iMachineNameHeight, iSnapshotNameHeight);
-    int iBottomLineHeight = qMax(iMachineStatePixmapHeight, iMachineStateTextHeight);
+    int iTopLineHeight = qMax(m_visibleNameSize.height(), m_visibleSnapshotNameSize.height());
+    int iBottomLineHeight = qMax(m_statePixmapSize.height(), m_stateTextSize.height());
     int iRightColumnHeight = iTopLineHeight +
-                              iMachineItemTextSpacing +
-                              iBottomLineHeight;
+                             iMachineItemTextSpacing +
+                             iBottomLineHeight;
     QList<int> heights;
-    heights << iMachinePixmapHeight << iRightColumnHeight << iToolBarHeight;
+    heights << m_pixmapSize.height() << iRightColumnHeight << iToolBarHeight;
     int iMaxHeight = 0;
     foreach (int iHeight, heights)