Implement numeric sorting of tree items with visible ID numbers

This allows showing object IDs as decimal instead of fixed-width hex while still sorting as expected.
H-uru · Mar 2, 2024 · 95e2dd4 · 95e2dd4
1 parent 59e2c99
commit 95e2dd4
Show file tree

Hide file tree

Showing 3 changed files with 24 additions and 1 deletion.
diff --git a/src/PrpShop/QPlasmaTreeItem.cpp b/src/PrpShop/QPlasmaTreeItem.cpp
@@ -114,27 +114,47 @@ void QPlasmaTreeItem::reinit()
 {
     switch (type()) {
         case kTypeNone:
+            fSortId = 0;
             setIcon(0, QIcon(":/img/folder.png"));
             break;
 
         case kTypeKO:
+            fSortId = s_showObjectIDs ? static_cast<int32_t>(fObjKey->getID()) : 0;
             setText(0, pqFormatKeyName(fObjKey));
             setIcon(0, pqGetTypeIcon(fObjKey->getType()));
             break;
 
         case kTypeClassType:
+            fSortId = s_showTypeIDs ? fClassType : 0;
             setText(0, pqGetFriendlyClassName(fClassType));
             setIcon(0, QIcon(":/img/folder.png"));
             break;
 
         case kTypeAge:
+            fSortId = 0;
             setText(0, fAge);
             setIcon(0, QIcon(":/img/age.png"));
             break;
 
         case kTypePage:
+            fSortId = 0;
             setText(0, st2qstr(fPage->getPage()));
             setIcon(0, QIcon(":/img/page.png"));
             break;
     }
 }
+
+bool QPlasmaTreeItem::operator<(const QTreeWidgetItem& other) const
+{
+    if (type() >= kTypeNone && type() < kMaxPlasmaTypes) {
+        // The other item is also one of ours,
+        // so try sorting numerically by ID.
+        auto otherPlasma = static_cast<const QPlasmaTreeItem&>(other);
+        if (fSortId != otherPlasma.fSortId) {
+            return fSortId < otherPlasma.fSortId;
+        }
+    }
+    // If the other item doesn't belong to us or if the two IDs are equal,
+    // fall back to default sorting by text.
+    return QTreeWidgetItem::operator<(other);
+}
diff --git a/src/PrpShop/QPlasmaTreeItem.h b/src/PrpShop/QPlasmaTreeItem.h
@@ -29,6 +29,7 @@ class QPlasmaTreeItem : public QTreeWidgetItem
     plPageInfo* fPage;
     bool fHasBuiltIn, fHasTextures;
     QString fAge;
+    int32_t fSortId;
 
     QString fFilename;
 
@@ -57,6 +58,8 @@ class QPlasmaTreeItem : public QTreeWidgetItem
 
     void reinit();
 
+    bool operator<(const QTreeWidgetItem& other) const override;
+
     hsKeyedObject* obj() const { return (type() == kTypeKO) ? fObjKey->getObj() : NULL; }
     short classType() const { return (type() == kTypeClassType) ? fClassType : static_cast<short>(0x8000); }
     QString age() const { return (type() == kTypeAge) ? fAge : QString(); }

diff --git a/src/PrpShop/QPlasmaUtils.cpp b/src/PrpShop/QPlasmaUtils.cpp
@@ -588,7 +588,7 @@ QString pqFormatKeyName(const plKey& obj)
 {
     if (s_showObjectIDs) {
         return QString("[%1] %2")
-            .arg(obj->getID(), 8, 16, QChar('0'))
+            .arg(obj->getID())
             .arg(st2qstr(obj->getName()));
     } else {
         return st2qstr(obj->getName());