Changeset 43807 in vbox

Timestamp:

Nov 6, 2012 7:36:18 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Group-item text size recalculation.

Location:

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

Files:

• UIGChooserItem.cpp (modified) (1 diff)
• UIGChooserItem.h (modified) (1 diff)
• UIGChooserItemGroup.cpp (modified) (1 diff)

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

@@ -348 +348 @@
 
 /* static */
+QSize UIGChooserItem::textSize(const QFont &font, QPaintDevice *pPaintDevice, const QString &strText)
+{
+    /* Make sure text is not empty: */
+    if (strText.isEmpty())
+        return QSize(0, 0);
+
+    /* Return text size, based on font-metrics: */
+    QFontMetrics fm(font, pPaintDevice);
+    return QSize(fm.width(strText), fm.height());
+}
+
+/* static */
 int UIGChooserItem::textWidth(const QFont &font, QPaintDevice *pPaintDevice, int iCount)
 {

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

@@ -173 +173 @@
     int dragTokenDarkness() const { return m_iDragTokenDarkness; }
 
-    /* Helpers: Text compression stuff: */
+    /* Helpers: Text processing stuff: */
+    static QSize textSize(const QFont &font, QPaintDevice *pPaintDevice, const QString &strText);
     static int textWidth(const QFont &font, QPaintDevice *pPaintDevice, int iCount);
     static QString compressText(const QFont &font, QPaintDevice *pPaintDevice, QString strText, int iWidth);

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

@@ -359 +359 @@
             return QSize(fm.width(strCompressedName), fm.height());
         }
-        case GroupItemData_NameSize:
-        {
-            if (isMainRoot())
-                return QSize(0, 0);
-            QFontMetrics fm(m_nameFont, model()->paintDevice());
-            return QSize(fm.width(data(GroupItemData_Name).toString()) + 2, fm.height());
-        }
-        case GroupItemData_GroupPixmapSize:
-            return isMainRoot() ? QSize(0, 0) : m_groupsPixmap.size();
-        case GroupItemData_MachinePixmapSize:
-            return isMainRoot() ? QSize(0, 0) : m_machinesPixmap.size();
-        case GroupItemData_GroupCountTextSize:
-        {
-            if (isMainRoot())
-                return QSize(0, 0);
-            QFontMetrics fm(m_infoFont, model()->paintDevice());
-            return QSize(fm.width(data(GroupItemData_GroupCountText).toString()), fm.height());
-        }
-        case GroupItemData_MachineCountTextSize:
-        {
-            if (isMainRoot())
-                return QSize(0, 0);
-            QFontMetrics fm(m_infoFont, model()->paintDevice());
-            return QSize(fm.width(data(GroupItemData_MachineCountText).toString()), fm.height());
-        }
+        case GroupItemData_NameSize: return isMainRoot() ? QSize(0, 0) : textSize(m_nameFont, model()->paintDevice(),
+                                                                                  data(GroupItemData_Name).toString());
+        case GroupItemData_GroupPixmapSize: return isMainRoot() ? QSize(0, 0) : m_groupsPixmap.size();
+        case GroupItemData_MachinePixmapSize: return isMainRoot() ? QSize(0, 0) : m_machinesPixmap.size();
+        case GroupItemData_GroupCountTextSize: return isMainRoot() ? QSize(0, 0) : textSize(m_infoFont, model()->paintDevice(),
+                                                                                            data(GroupItemData_GroupCountText).toString());
+        case GroupItemData_MachineCountTextSize: return isMainRoot() ? QSize(0, 0) : textSize(m_infoFont, model()->paintDevice(),
+                                                                                              data(GroupItemData_MachineCountText).toString());
         case GroupItemData_FullHeaderSize:
         {