#4791: Implement resource path selection for the ModelTreeView.

Since it is storing the skin paths and model paths in separate columns we need to override the base logic.
codereader · Jan 30, 2021 · c96c140 · c96c140
1 parent f48acb9
commit c96c140
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 1 deletion.
diff --git a/radiant/ui/modelselector/ModelTreeView.cpp b/radiant/ui/modelselector/ModelTreeView.cpp
@@ -27,6 +27,11 @@ const ModelTreeView::TreeColumns& ModelTreeView::Columns() const
     return _treeColumns;
 }
 
+std::string ModelTreeView::GetResourcePath(const wxutil::TreeModel::Row& row)
+{
+    return row[Columns().isSkin].getBool() ? row[Columns().skin] : row[Columns().modelPath];
+}
+
 void ModelTreeView::Populate()
 {
     ResourceTreeView::Populate(std::make_shared<ModelPopulator>(Columns()));

diff --git a/radiant/ui/modelselector/ModelTreeView.h b/radiant/ui/modelselector/ModelTreeView.h
@@ -5,7 +5,7 @@
 namespace ui
 {
 
-class ModelTreeView :
+class ModelTreeView final :
     public wxutil::ResourceTreeView
 {
 public:
@@ -52,6 +52,10 @@ class ModelTreeView :
 
     const TreeColumns& Columns() const;
 
+    // Override the resource path locator of the base class since we store
+    // skin paths and model paths in different columns
+    std::string GetResourcePath(const wxutil::TreeModel::Row& row) override;
+
 private:
     std::string GetColumnValue(const wxutil::TreeModel::Column& column);
 };