update

elementary · Oct 22, 2024 · 175fdf9 · 175fdf9
1 parent 812af82
commit 175fdf9
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 12 deletions.
diff --git a/data/settings.appdata.xml.in b/data/settings.appdata.xml.in
@@ -62,6 +62,7 @@
         </ul>
       </description>
       <issues>
+        <issue url="https://github.com/elementary/switchboard/issues/182">Reset search after displaying the result</issue>
         <issue url="https://github.com/elementary/switchboard/issues/224">Port System Settings to GTK4</issue>
         <issue url="https://github.com/elementary/switchboard/issues/232">preferences-desktop dark variant</issue>
         <issue url="https://github.com/elementary/switchboard/issues/247">It's possible to open two plugs at the same time</issue>

diff --git a/src/CategoryView.vala b/src/CategoryView.vala
@@ -115,12 +115,6 @@ public class Switchboard.CategoryView : Adw.NavigationPage {
             searchview.activate_first_item ();
         });
 
-        searchview.clear_search.connect (() => {
-            GLib.Timeout.add_once (stack.transition_duration, () => {
-                search_box.text = "";
-            });
-        });
-
         search_box_eventcontrollerkey.key_released.connect ((keyval, keycode, state) => {
             switch (keyval) {
                 case Gdk.Key.Down:

diff --git a/src/SearchView.vala b/src/SearchView.vala
@@ -21,8 +21,6 @@ public class Switchboard.SearchView : Gtk.Box {
     public Gtk.SearchEntry search_entry { get; construct; }
     private Gtk.ListBox listbox;
 
-    public signal void clear_search ();
-
     public SearchView (Gtk.SearchEntry search_entry) {
         Object (search_entry: search_entry);
     }
@@ -50,9 +48,12 @@ public class Switchboard.SearchView : Gtk.Box {
 
         search_entry.search_changed.connect (() => {
             alert_view.title = _("No Results for “%s”").printf (search_entry.text);
-            listbox.invalidate_filter ();
-            listbox.invalidate_sort ();
-            listbox.select_row (null);
+
+            if (search_entry.text.length > 0) {
+                listbox.invalidate_filter ();
+                listbox.invalidate_sort ();
+                listbox.select_row (null);
+            }
         });
 
         listbox.row_activated.connect ((row) => {
@@ -61,7 +62,7 @@ public class Switchboard.SearchView : Gtk.Box {
                 Switchboard.PlugsManager.get_default ()
             );
 
-            clear_search ();
+            search_entry.text = "";
         });
     }