Changeset 43779 in vbox

Timestamp:

Oct 31, 2012 10:22:48 AM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: VM group UI: Group/machine-count pixmap caching.

Location:

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

Files:

• UIGChooserItemGroup.cpp (modified) (6 diffs)
• UIGChooserItemGroup.h (modified) (3 diffs)

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

@@ -327 +327 @@
         case GroupItemData_MajorSpacing: return 10;
         case GroupItemData_MinorSpacing: return 3;
-        /* Pixmaps: */
-        case GroupItemData_GroupPixmap: return UIIconPool::iconSet(":/nw_16px.png");
-        case GroupItemData_MachinePixmap: return UIIconPool::iconSet(":/machine_16px.png");
         /* Fonts: */
         case GroupItemData_NameFont:
@@ -409 +406 @@
         }
         case GroupItemData_GroupPixmapSize:
-            return isMainRoot() ? QSizeF(0, 0) : data(GroupItemData_GroupPixmap).value<QIcon>().availableSizes().at(0);
+            return isMainRoot() ? QSize(0, 0) : m_groupsPixmap.size();
         case GroupItemData_MachinePixmapSize:
-            return isMainRoot() ? QSizeF(0, 0) : data(GroupItemData_MachinePixmap).value<QIcon>().availableSizes().at(0);
+            return isMainRoot() ? QSize(0, 0) : m_machinesPixmap.size();
         case GroupItemData_GroupCountTextSize:
         {
@@ -498 +495 @@
     m_iCornerRadius = 10;
     m_iBlackoutDarkness = 110;
+    m_groupsPixmap = QPixmap(":/nw_16px.png");
+    m_machinesPixmap = QPixmap(":/machine_16px.png");
 
     /* Non root item only: */
@@ -1518 +1517 @@
         QString strGroupCountText = data(GroupItemData_GroupCountText).toString();
         QString strMachineCountText = data(GroupItemData_MachineCountText).toString();
-        QPixmap groupPixmap = data(GroupItemData_GroupPixmap).value<QIcon>().pixmap(groupPixmapSize);
-        QPixmap machinePixmap = data(GroupItemData_MachinePixmap).value<QIcon>().pixmap(machinePixmapSize);
 
         /* Indent: */
@@ -1553 +1550 @@
                         QRect(QPoint(iMachinePixmapX, iMachinePixmapY), machinePixmapSize),
                         /* Pixmap to paint: */
-                        machinePixmap);
+                        m_machinesPixmap);
         }
 
@@ -1583 +1580 @@
                         QRect(QPoint(iGroupPixmapX, iGroupPixmapY), groupPixmapSize),
                         /* Pixmap to paint: */
-                        groupPixmap);
+                        m_groupsPixmap);
         }
     }

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

@@ -22 +22 @@
 /* Qt includes: */
 #include <QWidget>
+#include <QPixmap>
 
 /* GUI includes: */
@@ -104 +105 @@
         GroupItemData_MajorSpacing,
         GroupItemData_MinorSpacing,
-        /* Pixmaps: */
-        GroupItemData_GroupPixmap,
-        GroupItemData_MachinePixmap,
         /* Fonts: */
         GroupItemData_NameFont,
@@ -209 +207 @@
     bool m_fMainRoot;
     int m_iBlackoutDarkness;
+    QPixmap m_groupsPixmap;
+    QPixmap m_machinesPixmap;
 };