Changeset 102922 in vbox for trunk

Timestamp:

Jan 17, 2024 1:17:09 PM (16 months ago)

Author:

vboxsync

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

161150

Message:

FE/Qt: bugref:10513: VM settings / Storage page: A bit of rework for expanded/collapsed pixmap handling.

File:

• trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp (modified) (5 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/settings/editors/UIStorageSettingsEditor.cpp

@@ -596 +596 @@
     {
         R_ItemId = Qt::UserRole + 1,
-        R_ItemPixmap,
+        R_ItemPixmapDefault,
+        R_ItemPixmapCollapsed,
+        R_ItemPixmapExpanded,
         R_ItemPixmapRect,
         R_ItemName,
@@ -791 +793 @@
     StorageDelegate(QObject *pParent);
 
-private:
+protected:
 
     /** Paints @a index item with specified @a option using specified @a pPainter. */
-    void paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const;
+    virtual void paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const RT_OVERRIDE;
 };
 
@@ -1851 +1853 @@
             return QUuid();
         }
-        case R_ItemPixmap:
+        case R_ItemPixmapDefault:
         {
             if (AbstractItem *pItem = static_cast<AbstractItem*>(specifiedIndex.internalPointer()))
-            {
-                ItemState enmState = ItemState_Default;
-                if (hasChildren(specifiedIndex))
-                    if (QTreeView *view = qobject_cast<QTreeView*>(QObject::parent()))
-                        enmState = view->isExpanded(specifiedIndex) ? ItemState_Expanded : ItemState_Collapsed;
-                return pItem->pixmap(enmState);
-            }
+                return pItem->pixmap(ItemState_Default);
+            return QPixmap();
+        }
+        case R_ItemPixmapCollapsed:
+        {
+            if (AbstractItem *pItem = static_cast<AbstractItem*>(specifiedIndex.internalPointer()))
+                return pItem->pixmap(ItemState_Collapsed);
+            return QPixmap();
+        }
+        case R_ItemPixmapExpanded:
+        {
+            if (AbstractItem *pItem = static_cast<AbstractItem*>(specifiedIndex.internalPointer()))
+                return pItem->pixmap(ItemState_Expanded);
             return QPixmap();
         }
@@ -2772 +2780 @@
 void StorageDelegate::paint(QPainter *pPainter, const QStyleOptionViewItem &option, const QModelIndex &index) const
 {
-    if (!index.isValid()) return;
-
-    /* Initialize variables: */
+    /* Sanity check: */
+    if (!index.isValid())
+        return;
+
+    /* Acquire model: */
+    const StorageModel *pModel = qobject_cast<const StorageModel*>(index.model());
+    AssertPtrReturnVoid(pModel);
+
+    /* Fetch options: */
     QStyle::State enmState = option.state;
     QRect rect = option.rect;
-    const StorageModel *pModel = qobject_cast<const StorageModel*>(index.model());
-    Assert(pModel);
 
     pPainter->save();
@@ -2796 +2808 @@
 
     /* Draw Item Pixmap: */
+    const bool fHasChildren = enmState & QStyle::State_Children;
+    const bool fOpened = enmState & QStyle::State_Open;
+    QPixmap pixmap = !fHasChildren
+                   ? pModel->data(index, StorageModel::R_ItemPixmapDefault).value<QPixmap>()
+                   : !fOpened
+                   ? pModel->data(index, StorageModel::R_ItemPixmapCollapsed).value<QPixmap>()
+                   : pModel->data(index, StorageModel::R_ItemPixmapExpanded).value<QPixmap>();
     pPainter->drawPixmap(pModel->data(index, StorageModel::R_ItemPixmapRect).toRect().topLeft(),
-                         pModel->data(index, StorageModel::R_ItemPixmap).value<QPixmap>());
+                         pixmap);
 
     /* Draw compressed item name: */