Changeset 102923 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Jan 17, 2024 1:32:37 PM (11 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10513: VM settings / Storage page: Simplifying StorageDelegate painting procedure to be more abstract; This is necessary to work with proxy/filter model without changes.

File:

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

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

@@ -2781 +2781 @@
 {
     /* Sanity check: */
-    if (!index.isValid())
-        return;
+    AssertReturnVoid(index.isValid());
 
     /* Acquire model: */
-    const StorageModel *pModel = qobject_cast<const StorageModel*>(index.model());
+    const QAbstractItemModel *pModel = index.model();
     AssertPtrReturnVoid(pModel);
 
@@ -2799 +2798 @@
     /* Setup foreground settings: */
     QPalette::ColorGroup cg = enmState & QStyle::State_Active ? QPalette::Active : QPalette::Inactive;
-    bool fSelected = enmState & QStyle::State_Selected;
-    bool fFocused = enmState & QStyle::State_HasFocus;
-    bool fGrayOnLoosingFocus = QApplication::style()->styleHint(QStyle::SH_ItemView_ChangeHighlightOnFocus, &option) != 0;
+    const bool fSelected = enmState & QStyle::State_Selected;
+    const bool fFocused = enmState & QStyle::State_HasFocus;
+    const bool fGrayOnLoosingFocus = QApplication::style()->styleHint(QStyle::SH_ItemView_ChangeHighlightOnFocus, &option) != 0;
     pPainter->setPen(option.palette.color(cg, fSelected &&(fFocused || !fGrayOnLoosingFocus) ?
                                           QPalette::HighlightedText : QPalette::Text));
@@ -2807 +2806 @@
     pPainter->translate(rect.x(), rect.y());
 
-    /* Draw Item Pixmap: */
+    /* Draw item pixmap: */
     const bool fHasChildren = enmState & QStyle::State_Children;
     const bool fOpened = enmState & QStyle::State_Open;
@@ -2845 +2844 @@
     pPainter->drawText(textPosition, strShortText);
 
-    /* Draw Controller Additions: */
+    /* Draw controller additions: */
     if (pModel->data(index, StorageModel::R_IsController).toBool() && enmState & QStyle::State_Selected)
     {