#5814: Show icons for inherited properties

codereader · Nov 21, 2021 · 7184e72 · 7184e72
1 parent 6d4157f
commit 7184e72
Show file tree

Hide file tree

Showing 2 changed files with 33 additions and 24 deletions.
diff --git a/libs/wxutil/dataview/TreeViewItemStyle.h b/libs/wxutil/dataview/TreeViewItemStyle.h
@@ -45,6 +45,14 @@ class TreeViewItemStyle
         return wxDataViewItemAttr();
     }
 
+    static wxDataViewItemAttr Inherited()
+    {
+        wxDataViewItemAttr italic;
+        italic.SetItalic(true);
+
+        return italic;
+    }
+
     // Styles used by the merge action visualisation in data views
 
     static void ApplyKeyValueAddedStyle(wxDataViewItemAttr& attr)

diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -1552,36 +1552,37 @@ void EntityInspector::addClassAttribute(const EntityClassAttribute& a)
 {
     // Only add properties with values, we don't want the optional
     // "editor_var xxx" properties here.
-    if (!a.getValue().empty())
-    {
-        wxutil::TreeModel::Row row = _kvStore->AddItem();
+    if (a.getValue().empty()) return;
 
-        wxDataViewItemAttr grey;
-        grey.SetItalic(true);
+    auto row = _kvStore->AddItem();
 
-        row[_columns.name] = wxVariant(wxDataViewIconText(a.getName(), _emptyIcon));
-        row[_columns.value] = a.getValue();
+    auto style = wxutil::TreeViewItemStyle::Inherited();
 
-        // Inherited values have an inactive checkbox, so assign a false value and disable
-        if (a.getType() == "bool")
-        {
-            row[_columns.booleanValue] = a.getValue() == "1";
-        }
-        else
-        {
-            row[_columns.booleanValue] = false;
-            row[_columns.booleanValue].setEnabled(false);
-        }
+    row[_columns.name] = wxVariant(wxDataViewIconText(a.getName(), _emptyIcon));
+    row[_columns.value] = a.getValue();
 
-        row[_columns.name] = grey;
-        row[_columns.value] = grey;
-        row[_columns.oldValue] = std::string();
-        row[_columns.newValue] = std::string();
-
-        row[_columns.isInherited] = true;
+    // Load the correct icon for this key
+    updateKeyType(row);
 
-        row.SendItemAdded();
+    // Inherited values have an inactive checkbox, so assign a false value and disable
+    if (a.getType() == "bool")
+    {
+        row[_columns.booleanValue] = a.getValue() == "1";
+    }
+    else
+    {
+        row[_columns.booleanValue] = false;
+        row[_columns.booleanValue].setEnabled(false);
     }
+
+    row[_columns.name] = style;
+    row[_columns.value] = style;
+    row[_columns.oldValue] = std::string();
+    row[_columns.newValue] = std::string();
+
+    row[_columns.isInherited] = true;
+
+    row.SendItemAdded();
 }
 
 // Append inherited (entityclass) properties