#5791: Clear the ResourceTreeView filter when programmatically settin…

…g the selection.

ResourceTreeView class is now communicating the filter text cleared event to any event handlers. The ResourceTreeViewToolbar will react to that event.

libs/wxutil/dataview/ResourceTreeView.cpp

@@ -32,6 +32,7 @@ wxEvent* ResourceTreeView::PopulationFinishedEvent::Clone() const
 }
 
 wxDEFINE_EVENT(EV_TREEVIEW_POPULATION_FINISHED, ResourceTreeView::PopulationFinishedEvent);
+wxDEFINE_EVENT(EV_TREEVIEW_FILTERTEXT_CLEARED, wxCommandEvent);
 
 ResourceTreeView::ResourceTreeView(wxWindow* parent, const ResourceTreeView::Columns& columns, long style) :
     ResourceTreeView(parent, TreeModel::Ptr(), columns, style)
@@ -297,6 +298,8 @@ void ResourceTreeView::ClearFilterText()
     _filterText.clear();
 
     UpdateTreeVisibility();
+
+    wxQueueEvent(this, new wxCommandEvent(EV_TREEVIEW_FILTERTEXT_CLEARED));
 }
 
 std::string ResourceTreeView::GetSelectedFullname()
@@ -343,6 +346,9 @@ void ResourceTreeView::SetSelectedElement(const std::string& value, const TreeMo
         return;
     }
 
+    // Clear the filter before seeking an element
+    ClearFilterText();
+
     // Find the requested element
     auto item = GetTreeModel()->FindString(value, column);
 

libs/wxutil/dataview/ResourceTreeView.h

@@ -197,5 +197,7 @@ class ResourceTreeView :
 
 // Emitted when the tree view is done populating
 wxDECLARE_EVENT(EV_TREEVIEW_POPULATION_FINISHED, ResourceTreeView::PopulationFinishedEvent);
+// Emitted when the tree view cleared its filter text on its own
+wxDECLARE_EVENT(EV_TREEVIEW_FILTERTEXT_CLEARED, wxCommandEvent);
 
 }

libs/wxutil/dataview/ResourceTreeViewToolbar.cpp

@@ -95,6 +95,12 @@ void ResourceTreeViewToolbar::EnableFavouriteManagement(bool enable)
 void ResourceTreeViewToolbar::AssociateToTreeView(ResourceTreeView* treeView)
 {
     _treeView = treeView;
+
+    if (_treeView != nullptr)
+    {
+        _treeView->Bind(EV_TREEVIEW_FILTERTEXT_CLEARED, &ResourceTreeViewToolbar::_onTreeViewFilterTextCleared, this);
+    }
+
     UpdateFromTreeView();
 }
 
@@ -188,6 +194,13 @@ void ResourceTreeViewToolbar::_onFilterButtonToggled(wxCommandEvent& ev)
     HandleFilterEntryChanged();
 }
 
+void ResourceTreeViewToolbar::_onTreeViewFilterTextCleared(wxCommandEvent& ev)
+{
+    // Tree view cleared the filter, clear our entry box
+    _filterEntry->Clear();
+    ev.Skip();
+}
+
 void ResourceTreeViewToolbar::UpdateFromTreeView()
 {
     if (_treeView == nullptr) return;

libs/wxutil/dataview/ResourceTreeViewToolbar.h

@@ -51,6 +51,7 @@ class ResourceTreeViewToolbar :
     void _onEntryChar(wxKeyEvent& ev);
     void _onEntryText(wxCommandEvent& ev);
     void _onFilterButtonToggled(wxCommandEvent& ev);
+    void _onTreeViewFilterTextCleared(wxCommandEvent& ev);
 
     void HandleFilterEntryChanged();
     void UpdateFromTreeView();