#6140: Clear the resource tree view toolbar's filter on ESC

codereader · Oct 28, 2022 · 3e3b99b · 3e3b99b
1 parent 4f48766
commit 3e3b99b
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/libs/wxutil/dataview/ResourceTreeViewToolbar.cpp b/libs/wxutil/dataview/ResourceTreeViewToolbar.cpp
@@ -12,7 +12,7 @@ namespace wxutil
 
 namespace
 {
-    constexpr const int APPLY_FILTER_TEXT_DELAY_MSEC = 250;
+    constexpr int APPLY_FILTER_TEXT_DELAY_MSEC = 250;
 }
 
 ResourceTreeViewToolbar::ResourceTreeViewToolbar(wxWindow* parent, ResourceTreeView* treeView) :
@@ -48,6 +48,7 @@ ResourceTreeViewToolbar::ResourceTreeViewToolbar(wxWindow* parent, ResourceTreeV
     _filterEntry->SetMinSize(wxSize(100, -1));
     _filterEntry->Bind(wxEVT_TEXT, &ResourceTreeViewToolbar::_onEntryText, this);
     _filterEntry->Bind(wxEVT_CHAR, &ResourceTreeViewToolbar::_onEntryChar, this);
+    _filterEntry->Bind(wxEVT_KEY_DOWN, &ResourceTreeViewToolbar::_onEntryKeyDown, this);
     _filterEntry->SetToolTip(_("Enter search text to filter the tree,\nuse arrow keys to navigate"));
 
     auto nextImg = wxutil::GetLocalBitmap("arrow_down.png");
@@ -163,6 +164,19 @@ void ResourceTreeViewToolbar::_onEntryChar(wxKeyEvent& ev)
     }
 }
 
+void ResourceTreeViewToolbar::_onEntryKeyDown(wxKeyEvent& ev)
+{
+    if (ev.GetKeyCode() == WXK_ESCAPE)
+    {
+        // Clear the search box on esc and focus the tree view
+        ClearFilter();
+        _treeView->SetFocus();
+        return;
+    }
+
+    ev.Skip();
+}
+
 void ResourceTreeViewToolbar::_onEntryText(wxCommandEvent& ev)
 {
     HandleFilterEntryChanged();

diff --git a/libs/wxutil/dataview/ResourceTreeViewToolbar.h b/libs/wxutil/dataview/ResourceTreeViewToolbar.h
@@ -52,6 +52,7 @@ class ResourceTreeViewToolbar :
     void JumpToPrevFilterMatch();
 
     void _onEntryChar(wxKeyEvent& ev);
+    void _onEntryKeyDown(wxKeyEvent& ev);
     void _onEntryText(wxCommandEvent& ev);
     void _onFilterButtonToggled(wxCommandEvent& ev);
     void _onTreeViewFilterTextCleared(wxCommandEvent& ev);