gtk4: Reimplement Find keybinding

Closes tchx84#517 Signed-off-by: Nefo Fortressia <nefothingy@hotmail.com>
A6GibKm · Apr 5, 2023 · bef5eed · bef5eed
1 parent 7fff553
commit bef5eed
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 30 deletions.
diff --git a/src/widgets/window.js b/src/widgets/window.js
@@ -54,7 +54,7 @@ var FlatsealWindow = GObject.registerClass({
         'actionBar',
         'appInfoGroup',
         'applicationsSearchButton',
-        'applicationsSearchRevealer',
+        'applicationsSearchBar',
         'applicationsSearchEntry',
         'applicationsStack',
         'applicationsListBox',
@@ -72,11 +72,6 @@ var FlatsealWindow = GObject.registerClass({
         'undoPopupBox',
         'permissionsTitle',
     ],
-    Signals: {
-        find: {
-            flags: GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION,
-        },
-    },
 }, class FlatsealWindow extends Adw.ApplicationWindow {
     _init(application) {
         super._init({application});
@@ -241,15 +236,15 @@ var FlatsealWindow = GObject.registerClass({
         this._applicationsSearchEntry.connect('search-changed', this._resetSearch.bind(this));
 
         this._applicationsSearchButton.bind_property(
-            'active', this._applicationsSearchRevealer, 'reveal-child', _bindFlags);
+            'active', this._applicationsSearchBar, 'search-mode-enabled', _bindFlags);
         this._applicationsSearchButton.connect(
             'toggled', this._toggleSearchWithButton.bind(this));
 
-        this.connect('find', this._enableSearchWithShortcut.bind(this));
-
         this._showApplications();
         this._backButton.set_sensitive(true);
         this._backButton.connect('clicked', this._showApplications.bind(this));
+
+        this._applicationsSearchBar.set_key_capture_widget(this.root);
     }
 
     _shutdown() {
@@ -342,14 +337,7 @@ var FlatsealWindow = GObject.registerClass({
         return 1;
     }
 
-    _enableSearchWithShortcut() {
-        this._applicationsSearchRevealer.reveal_child = true;
-        this._applicationsSearchEntry.grab_focus();
-    }
-
     _toggleSearchWithButton() {
-        this._applicationsSearchEntry.set_text('');
-
         if (this._applicationsSearchButton.active)
             this._applicationsSearchEntry.grab_focus();
         else
@@ -358,7 +346,7 @@ var FlatsealWindow = GObject.registerClass({
 
     _cancelSearch() {
         if (this._applicationsSearchEntry.get_text() === '')
-            this._applicationsSearchRevealer.reveal_child = false;
+            this._applicationsSearchBar.search_mode_enabled = false;
 
         this._applicationsSearchEntry.set_text('');
     }

diff --git a/src/widgets/window.ui b/src/widgets/window.ui
@@ -53,6 +53,17 @@
                             <property name="icon-name">system-search-symbolic</property>
                           </object>
                         </child>
+                        <child>
+                          <object class="GtkShortcutController">
+                            <property name="scope">global</property>
+                            <child>
+                              <object class="GtkShortcut">
+                                <property name="trigger">&lt;Control&gt;F</property>
+                                <property name="action">activate</property>
+                              </object>
+                            </child>
+                          </object>
+                        </child>
                       </object>
                     </child>
                   </object>
@@ -107,19 +118,10 @@
                               <object class="GtkBox" id="applicationsBox">
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkRevealer" id="applicationsSearchRevealer">
-                                    <property name="reveal-child">1</property>
-                                    <property name="child">
-                                      <object class="GtkSearchEntry" id="applicationsSearchEntry">
-                                        <property name="focusable">1</property>
-                                        <!--property name="primary-icon-name">edit-find-symbolic</property> -->
-                                        <!--<property name="primary-icon-activatable">False</property>-->
-                                        <!--<property name="primary-icon-sensitive">False</property>-->
-                                        <style>
-                                          <class name="search-entry" />
-                                        </style>
-                                      </object>
-                                    </property>
+                                  <object class="GtkSearchBar" id="applicationsSearchBar">
+                                    <child>
+                                      <object class="GtkSearchEntry" id="applicationsSearchEntry" />
+                                    </child>
                                   </object>
                                 </child>
                                 <child>