#5613: Display the ambiguous values in italics (if supported)

codereader · Oct 17, 2021 · b9d5317 · b9d5317
1 parent f349ecc
commit b9d5317
Show file tree

Hide file tree

Showing 3 changed files with 25 additions and 5 deletions.
diff --git a/libs/wxutil/dataview/TreeViewItemStyle.h b/libs/wxutil/dataview/TreeViewItemStyle.h
@@ -88,6 +88,12 @@ class TreeViewItemStyle
         SetStrikethrough(attr, true);
     }
 
+    static void ApplyKeyValueAmbiguousStyle(wxDataViewItemAttr& attr)
+    {
+        attr.SetColour(wxColour(80, 80, 80));
+        SetItalic(attr, true);
+    }
+
     static void ApplyKeyValueConflictStyle(wxDataViewItemAttr& attr)
     {
         if (SupportsBackgroundColour())
@@ -108,6 +114,13 @@ class TreeViewItemStyle
 #endif
     }
 
+    static void SetItalic(wxDataViewItemAttr& attr, bool enabled)
+    {
+#if wxCHECK_VERSION(3, 1, 2)
+        attr.SetItalic(enabled);
+#endif
+    }
+
 private:
 
     // Returns true if wxWidgets supports setting the background colour of items

diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -205,7 +205,7 @@ void EntityInspector::onKeyInsert(const std::string& key,
     //onKeyChange(key, value.get());
 }
 
-void EntityInspector::onKeyChange(const std::string& key, const std::string& value)
+void EntityInspector::onKeyChange(const std::string& key, const std::string& value, bool isMultiValue)
 {
     wxDataViewItem keyValueIter;
     bool added = false;
@@ -336,9 +336,16 @@ void EntityInspector::onKeyChange(const std::string& key, const std::string& val
 
     // Apply background style to all other columns
     row[_columns.name] = style;
-    row[_columns.value] = style;
     row[_columns.booleanValue] = style;
 
+    // Before applying the style to the value, check if the value is ambiguous
+    if (isMultiValue)
+    {
+        wxutil::TreeViewItemStyle::ApplyKeyValueAmbiguousStyle(style);
+    }
+
+    row[_columns.value] = style;
+
     row[_columns.isInherited] = false;
     row[_columns.hasHelpText] = key == "classname" || hasDescription; // classname always has a description
 
@@ -514,12 +521,12 @@ void EntityInspector::onKeyRemoved(const std::string& key)
 
 void EntityInspector::onKeyValueSetChanged(const std::string& key, const std::string& uniqueValue)
 {
-    onKeyChange(key, uniqueValue.empty() ? _("[differing values]") : uniqueValue);
+    onKeyChange(key, uniqueValue.empty() ? _("[differing values]") : uniqueValue, uniqueValue.empty());
 }
 
 void EntityInspector::onUndoRedoOperation()
 {
-    refresh();
+    //refresh();
 }
 
 void EntityInspector::onDefsReloaded()

diff --git a/radiant/ui/einspector/EntityInspector.h b/radiant/ui/einspector/EntityInspector.h
@@ -287,7 +287,7 @@ class EntityInspector final :
 	void onMainFrameShuttingDown();
 
     void onKeyInsert(const std::string& key, EntityKeyValue& value);
-    void onKeyChange(const std::string& key, const std::string& value);
+    void onKeyChange(const std::string& key, const std::string& value, bool isMultiValue = false);
     void onKeyErase(const std::string& key, EntityKeyValue& value);
 
 	// greebo: Tells the inspector to reload the window settings from the registry.