Use Gtk Filter for custom filters

Author: leolost2605

src/Widgets/WindowOverview.vala

@@ -115,8 +115,8 @@ public class Gala.WindowOverview : ActorTarget, RootTarget, ActivatableComponent
             var geometry = display.get_monitor_geometry (i);
             var scale = display.get_monitor_scale (i);
 
-            var model = new WindowListModel (display, STACKING, true, i);
-            model.set_custom_filter (window_filter_func);
+            var custom_filter = new Gtk.CustomFilter (window_filter_func);
+            var model = new WindowListModel (display, STACKING, true, i, null, custom_filter);
             model.items_changed.connect (on_items_changed);
 
             window_clone_container = new WindowCloneContainer (wm, model, scale, true) {
@@ -166,7 +166,8 @@ public class Gala.WindowOverview : ActorTarget, RootTarget, ActivatableComponent
         return true;
     }
 
-    private bool window_filter_func (Meta.Window window) {
+    private bool window_filter_func (Object obj) {
+        var window = (Meta.Window) obj;
         return window_ids == null || (window.get_id () in window_ids);
     }
 

src/WindowListModel.vala

@@ -16,8 +16,6 @@ public class Gala.WindowListModel : Object, ListModel {
         STACKING
     }
 
-    public delegate bool WindowFilter (Meta.Window window);
-
     public Meta.Display display { get; construct; }
 
     public SortMode sort_mode { get; construct; }
@@ -38,18 +36,20 @@ public class Gala.WindowListModel : Object, ListModel {
      */
     public Meta.Workspace? workspace_filter { get; construct set; }
 
-    private Gee.ArrayList<Meta.Window> windows;
+    public Gtk.Filter? custom_filter { get; construct set; }
 
-    private WindowFilter? custom_filter = null;
+    private Gee.ArrayList<Meta.Window> windows;
 
     public WindowListModel (
         Meta.Display display, SortMode sort_mode = NONE,
         bool normal_filter = false, int monitor_filter = -1,
-        Meta.Workspace? workspace_filter = null
+        Meta.Workspace? workspace_filter = null,
+        Gtk.Filter? custom_filter = null
     ) {
         Object (
             display: display, sort_mode: sort_mode, normal_filter: normal_filter,
-            monitor_filter: monitor_filter, workspace_filter: workspace_filter
+            monitor_filter: monitor_filter, workspace_filter: workspace_filter,
+            custom_filter: custom_filter
         );
     }
 
@@ -68,11 +68,6 @@ public class Gala.WindowListModel : Object, ListModel {
         check_all ();
     }
 
-    public void set_custom_filter (WindowFilter? filter) {
-        custom_filter = filter;
-        check_all ();
-    }
-
     private void on_window_created (Meta.Window window) {
         window.unmanaging.connect (on_window_unmanaging);
         InternalUtils.wait_for_window_actor (window, (actor) => check_window (actor.meta_window));
@@ -123,7 +118,7 @@ public class Gala.WindowListModel : Object, ListModel {
         }
 
         if (custom_filter != null) {
-            return custom_filter (window);
+            return custom_filter.match (window);
         }
 
         return true;