Changeset 43810 in vbox for trunk/src

Timestamp:

Nov 6, 2012 9:43:09 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Some group-item cleanup.

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (5 diffs)
• UIGChooserItemGroup.h (modified) (1 diff)

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

@@ -362 +362 @@
         case GroupItemData_EnterButtonSize: return m_pEnterButton ? m_pEnterButton->minimumSizeHint().toSize() : QSize(0, 0);
         case GroupItemData_ExitButtonSize: return m_pExitButton ? m_pExitButton->minimumSizeHint().toSize() : QSize(0, 0);
-        case GroupItemData_MinimumNameSize:
-        {
-            if (isMainRoot())
-                return QSize(0, 0);
-            QPaintDevice *pPaintDevice = model()->paintDevice();
-            QFontMetrics fm(m_nameFont, pPaintDevice);
-            int iMaximumTextWidth = textWidth(m_nameFont, pPaintDevice, 20);
-            QString strCompressedName = compressText(m_nameFont, pPaintDevice, m_strName, iMaximumTextWidth);
-            return QSize(fm.width(strCompressedName), fm.height());
-        }
         case GroupItemData_NameSize: return isMainRoot() ? QSize(0, 0) : textSize(m_nameFont, model()->paintDevice(),
                                                                                   data(GroupItemData_Name).toString());
@@ -514 +504 @@
     QSize exitButtonSize = data(GroupItemData_ExitButtonSize).toSize();
     QSize toggleButtonSize = data(GroupItemData_ToggleButtonSize).toSize();
-    QSize minimumNameSize = data(GroupItemData_MinimumNameSize).toSize();
     QSize groupPixmapSize = data(GroupItemData_GroupPixmapSize).toSize();
     QSize groupCountTextSize = data(GroupItemData_GroupCountTextSize).toSize();
@@ -520 +509 @@
     QSize machineCountTextSize = data(GroupItemData_MachineCountTextSize).toSize();
     QSize enterButtonSize = data(GroupItemData_EnterButtonSize).toSize();
+
+    /* Calculate minimum visible name size: */
+    QPaintDevice *pPaintDevice = model()->paintDevice();
+    QFontMetrics fm(m_nameFont, pPaintDevice);
+    int iMaximumNameWidth = textWidth(m_nameFont, pPaintDevice, 20);
+    QString strCompressedName = compressText(m_nameFont, pPaintDevice, m_strName, iMaximumNameWidth);
+    int iMinimumNameWidth = fm.width(strCompressedName);
+    int iMinimumNameHeight = fm.height();
 
     /* Calculate minimum width: */
@@ -531 +528 @@
                     iMajorSpacing +
                     /* Minimum name width: */
-                    minimumNameSize.width() +
+                    iMinimumNameWidth +
                     /* Spacing between name and info: */
                     iMajorSpacing;
@@ -554 +551 @@
         heights << toggleButtonSize.height();
     heights /* Minimum name height: */
-            << minimumNameSize.height()
+            << iMinimumNameHeight
             /* Group info height: */
             << groupPixmapSize.height() << groupCountTextSize.height()

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

@@ -116 +116 @@
         GroupItemData_EnterButtonSize,
         GroupItemData_ExitButtonSize,
-        GroupItemData_MinimumNameSize,
         GroupItemData_NameSize,
         GroupItemData_GroupPixmapSize,