From 41881be4991df726bdfbe22e8db674de645ee6e4 Mon Sep 17 00:00:00 2001
From: Basile Burg <basile.b@gmx.com>
Date: Sun, 3 Feb 2019 17:58:41 +0100
Subject: [PATCH] fix #439 - Better shortcut filter

---
 src/u_shortcutseditor.lfm |  2 +-
 src/u_shortcutseditor.pas | 33 +++++++++++++++------------------
 2 files changed, 16 insertions(+), 19 deletions(-)

diff --git a/src/u_shortcutseditor.lfm b/src/u_shortcutseditor.lfm
index 7624e615..e7753bd8 100644
--- a/src/u_shortcutseditor.lfm
+++ b/src/u_shortcutseditor.lfm
@@ -25,7 +25,6 @@ object ShortcutEditor: TShortcutEditor
       Height = 27
       Top = 2
       Width = 420
-      OnFilterItem = fltItemsFilterItem
       ButtonWidth = 28
       Align = alTop
       BorderSpacing.Around = 2
@@ -33,6 +32,7 @@ object ShortcutEditor: TShortcutEditor
       MaxLength = 0
       TabOrder = 0
       FilteredTreeview = tree
+      OnFilterNode = fltItemsFilterNode
     end
     object tree: TTreeView
       Left = 2
diff --git a/src/u_shortcutseditor.pas b/src/u_shortcutseditor.pas
index cc8c0205..92f17e1b 100644
--- a/src/u_shortcutseditor.pas
+++ b/src/u_shortcutseditor.pas
@@ -65,7 +65,7 @@ type
     tree: TTreeView;
     procedure btnClearClick(Sender: TObject);
     procedure btnEditClick(Sender: TObject);
-    function fltItemsFilterItem(Item: TObject; out Done: Boolean): Boolean;
+    function fltItemsFilterNode(ItemNode: TTreeNode; out Done: Boolean): Boolean;
     procedure shortcutCatcherExit(Sender: TObject);
     procedure shortcutCatcherMouseLeave(Sender: TObject);
     procedure propeditModified(Sender: TObject);
@@ -377,26 +377,23 @@ begin
   propedit.Rows[0].Editor.Edit;
 end;
 
-function TShortcutEditor.fltItemsFilterItem(Item: TObject; out Done: Boolean): Boolean;
+function TShortcutEditor.fltItemsFilterNode(ItemNode: TTreeNode; out Done: Boolean): Boolean;
 var
-  shc: TShortcutItem;
+  s: TShortcutItem;
+  b: boolean;
 begin
   if fltItems.Filter.isBlank then
-  begin
-    result := true;
-    done := true;
-  end
-  else
-  begin
-    result := false;
-    done := false;
-    // see TTreeFilterEdit: they pass TObject(TTreeNode.Data) and not a TTreeNode
-    if Pointer(item).isNil then
-      exit;
-    shc := TShortcutItem(item);
-    result := AnsiContainsText(shc.combination, fltItems.Filter);
-    done := true;
-  end;
+    exit(true);
+
+  // keep categories
+  if ItemNode.Parent.isNil then
+    exit(true);
+
+  b := AnsiContainsText(ItemNode.Text, fltItems.Filter);
+  if ItemNode.Data.isNil then
+    exit(b);
+  s := TShortcutItem(ItemNode.Data);
+  result := AnsiContainsText(s.combination, fltItems.Filter) or b;
 end;
 
 procedure TShortcutEditor.updateEditCtrls;