Resolve #4467: Clicking Entity Pane Columns for sorting cannot be undone

New behaviour is to reset the sorting when the entity selection changes
codereader · Jan 27, 2017 · 9dff99d · 9dff99d
1 parent 5d202c8
commit 9dff99d
Show file tree

Hide file tree

Showing 3 changed files with 11 additions and 0 deletions.
diff --git a/libs/wxutil/TreeView.cpp b/libs/wxutil/TreeView.cpp
@@ -92,6 +92,11 @@ void TreeView::ExpandTopLevelItems()
 	});
 }
 
+void TreeView::ResetSortingOnAllColumns()
+{
+	ResetAllSortColumns();
+}
+
 void TreeView::AddSearchColumn(const TreeModel::Column& column)
 {
 	// Only text columns are supported right now

diff --git a/libs/wxutil/TreeView.h b/libs/wxutil/TreeView.h
@@ -53,6 +53,9 @@ class TreeView :
 	// Expands the first level of all the top-level items
 	void ExpandTopLevelItems();
 
+	// Removes any sort keys
+	void ResetSortingOnAllColumns();
+
 	// Adds a column to search when the user starts typing
 	void AddSearchColumn(const TreeModel::Column& column);
 

diff --git a/radiant/ui/einspector/EntityInspector.cpp b/radiant/ui/einspector/EntityInspector.cpp
@@ -1243,6 +1243,9 @@ void EntityInspector::changeSelectedEntity(const scene::INodePtr& newEntity)
     // a chance to disconnect the list store might contain remnants
     _keyValueIterMap.clear();
     _kvStore->Clear();
+
+	// Reset the sorting when changing entities
+	_keyValueTreeView->ResetSortingOnAllColumns();
 
     // Attach to new entity if it is non-NULL
     if (newEntity)