#5537: ResourceTreeView finished event should propagate upwards

codereader · Sep 18, 2022 · 70f7fa7 · 70f7fa7
1 parent af96a3f
commit 70f7fa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/libs/wxutil/dataview/ResourceTreeView.cpp b/libs/wxutil/dataview/ResourceTreeView.cpp
@@ -20,7 +20,9 @@ namespace
 // Event implementation
 ResourceTreeView::PopulationFinishedEvent::PopulationFinishedEvent(int id) :
     wxEvent(id, EV_TREEVIEW_POPULATION_FINISHED)
-{}
+{
+    m_propagationLevel = wxEVENT_PROPAGATE_MAX;
+}
 
 ResourceTreeView::PopulationFinishedEvent::PopulationFinishedEvent(const PopulationFinishedEvent& event) :
     wxEvent(event)

diff --git a/radiant/ui/common/SkinChooser.cpp b/radiant/ui/common/SkinChooser.cpp
@@ -213,6 +213,8 @@ class SkinSelector :
         // Make sure the "matching skins" item is expanded
         GetTreeView()->Expand(_matchingSkinsItem);
         GetTreeView()->Collapse(_allSkinsItem);
+
+        ev.Skip();
     }
 };
 
@@ -232,6 +234,7 @@ void SkinChooser::populateWindow()
 	GetSizer()->Add(vbox, 1, wxEXPAND | wxALL, 12);
 
     _selector = new SkinSelector(this, _model);
+    _selector->Bind(wxutil::EV_TREEVIEW_POPULATION_FINISHED, &SkinChooser::_onTreeViewPopulationFinished, this);
 
 #if 0
     wxSplitterWindow* splitter = new wxSplitterWindow(this, wxID_ANY, wxDefaultPosition,