Add convenience method to TreeView class

codereader · Dec 25, 2016 · 4056bac · 4056bac
1 parent 6732b8b
commit 4056bac
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 7 deletions.
diff --git a/libs/wxutil/TreeView.cpp b/libs/wxutil/TreeView.cpp
@@ -76,6 +76,22 @@ void TreeView::TriggerColumnSizeEvent(const wxDataViewItem& item)
     });
 }
 
+void TreeView::ExpandTopLevelItems()
+{
+	TreeModel* model = dynamic_cast<TreeModel*>(GetModel());
+
+	if (model == nullptr) return;
+
+	// Expand the first layer
+	wxDataViewItemArray children;
+	model->GetChildren(model->GetRoot(), children);
+
+	std::for_each(children.begin(), children.end(), [&](const wxDataViewItem& item)
+	{
+		Expand(item);
+	});
+}
+
 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
@@ -50,6 +50,9 @@ class TreeView :
     // Call this if your text columns get squashed and are not sized correctly
     void TriggerColumnSizeEvent(const wxDataViewItem& item = wxDataViewItem());
 
+	// Expands the first level of all the top-level items
+	void ExpandTopLevelItems();
+
 	// Adds a column to search when the user starts typing
 	void AddSearchColumn(const TreeModel::Column& column);
 

diff --git a/radiant/ui/entitychooser/EntityClassChooser.cpp b/radiant/ui/entitychooser/EntityClassChooser.cpp
@@ -265,13 +265,7 @@ void EntityClassChooser::setTreeViewModel()
 	_treeView->AssociateModel(_treeStore.get());
 
 	// Expand the first layer
-	wxDataViewItemArray children;
-	_treeStore->GetChildren(_treeStore->GetRoot(), children);
-
-	std::for_each(children.begin(), children.end(), [&] (const wxDataViewItem& item)
-	{
-		_treeView->Expand(item);
-	});
+	_treeView->ExpandTopLevelItems();
 
     // Pre-select the given class if requested by setSelectedEntityClass()
     if (!_classToHighlight.empty())