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

Timestamp:

Oct 31, 2012 11:25:58 AM (12 years ago)

Author:

vboxsync

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

81745

Message:

FE/Qt: VM group UI: Font caching for group-item.

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (12 diffs)
• UIGChooserItemGroup.h (modified) (2 diffs)

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

@@ -327 +327 @@
         case GroupItemData_MajorSpacing: return 10;
         case GroupItemData_MinorSpacing: return 3;
-        /* Fonts: */
-        case GroupItemData_NameFont:
-        {
-            QFont nameFont = font();
-            nameFont.setWeight(QFont::Bold);
-            return nameFont;
-        }
-        case GroupItemData_InfoFont:
-        {
-            QFont infoFont = font();
-            return infoFont;
-        }
         /* Texts: */
         case GroupItemData_Name:
@@ -370 +358 @@
             if (isHovered() && !strMachineCountText.isEmpty())
                 iMaximumWidth -= (iMachinePixmapWidth + iMachineCountTextWidth);
-            return compressText(data(GroupItemData_NameFont).value<QFont>(),
-                                model()->paintDevice(),
-                                m_strName, iMaximumWidth);
+            return compressText(m_nameFont, model()->paintDevice(), m_strName, iMaximumWidth);
         }
         case GroupItemData_GroupCountText: return m_groupItems.isEmpty() ? QString() : QString::number(m_groupItems.size());
@@ -384 +370 @@
             if (isMainRoot())
                 return QSize(0, 0);
-            QFont font = data(GroupItemData_NameFont).value<QFont>();
             QPaintDevice *pPaintDevice = model()->paintDevice();
-            QFontMetrics fm(font, pPaintDevice);
-            int iMaximumTextWidth = textWidth(font, pPaintDevice, 20);
-            QString strCompressedName = compressText(font, pPaintDevice,
-                                                     m_strName, iMaximumTextWidth);
+            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());
         }
@@ -396 +380 @@
             if (isMainRoot())
                 return QSize(0, 0);
-            QFontMetrics fm(data(GroupItemData_NameFont).value<QFont>(), model()->paintDevice());
+            QFontMetrics fm(m_nameFont, model()->paintDevice());
             return QSize(fm.width(data(GroupItemData_Name).toString()) + 2, fm.height());
         }
@@ -407 +391 @@
             if (isMainRoot())
                 return QSize(0, 0);
-            QFontMetrics fm(data(GroupItemData_InfoFont).value<QFont>(), model()->paintDevice());
+            QFontMetrics fm(m_infoFont, model()->paintDevice());
             return QSize(fm.width(data(GroupItemData_GroupCountText).toString()), fm.height());
         }
@@ -414 +398 @@
             if (isMainRoot())
                 return QSize(0, 0);
-            QFontMetrics fm(data(GroupItemData_InfoFont).value<QFont>(), model()->paintDevice());
+            QFontMetrics fm(m_infoFont, model()->paintDevice());
             return QSize(fm.width(data(GroupItemData_MachineCountText).toString()), fm.height());
         }
@@ -489 +473 @@
     m_iCornerRadius = 10;
     m_iBlackoutDarkness = 110;
+    m_nameFont = font();
+    m_nameFont.setWeight(QFont::Bold);
+    m_infoFont = font();
     m_groupsPixmap = QPixmap(":/nw_16px.png");
     m_machinesPixmap = QPixmap(":/machine_16px.png");
@@ -508 +495 @@
         /* Setup name-editor: */
         m_pNameEditorWidget = new UIGroupRenameEditor(m_strName, this);
-        m_pNameEditorWidget->setFont(data(GroupItemData_NameFont).value<QFont>());
+        m_pNameEditorWidget->setFont(m_nameFont);
         connect(m_pNameEditorWidget, SIGNAL(sigEditingFinished()), this, SLOT(sltNameEditingFinished()));
         m_pNameEditor = new QGraphicsProxyWidget(this);
@@ -1487 +1474 @@
               QPoint(iNameX, iNameY),
               /* Font to paint text: */
-              data(GroupItemData_NameFont).value<QFont>(),
+              m_nameFont,
               /* Paint device: */
               model()->paintDevice(),
@@ -1508 +1495 @@
         QSize groupCountTextSize = data(GroupItemData_GroupCountTextSize).toSize();
         QSize machineCountTextSize = data(GroupItemData_MachineCountTextSize).toSize();
-        QFont infoFont = data(GroupItemData_InfoFont).value<QFont>();
         QString strGroupCountText = data(GroupItemData_GroupCountText).toString();
         QString strMachineCountText = data(GroupItemData_MachineCountText).toString();
@@ -1529 +1515 @@
                       QPoint(iMachineCountTextX, iMachineCountTextY),
                       /* Font to paint text: */
-                      infoFont,
+                      m_infoFont,
                       /* Paint device: */
                       model()->paintDevice(),
@@ -1559 +1545 @@
                       QPoint(iGroupCountTextX, iGroupCountTextY),
                       /* Font to paint text: */
-                      infoFont,
+                      m_infoFont,
                       /* Paint device: */
                       model()->paintDevice(),

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

@@ -105 +105 @@
         GroupItemData_MajorSpacing,
         GroupItemData_MinorSpacing,
-        /* Fonts: */
-        GroupItemData_NameFont,
-        GroupItemData_InfoFont,
         /* Text: */
         GroupItemData_Name,
@@ -206 +203 @@
     bool m_fMainRoot;
     int m_iBlackoutDarkness;
+    /* Cached values: */
+    QFont m_nameFont;
+    QFont m_infoFont;
     QPixmap m_groupsPixmap;
     QPixmap m_machinesPixmap;