at long last... ^C f to search and fix focus xou816#32

SarahRemus · Feb 20, 2022 · 2ac769f · 2ac769f
1 parent 986e3d8
commit 2ac769f
Show file tree

Hide file tree

Showing 6 changed files with 33 additions and 9 deletions.
diff --git a/src/app/components/navigation/navigation.rs b/src/app/components/navigation/navigation.rs
@@ -1,3 +1,4 @@
+use gtk::traits::WidgetExt;
 use libadwaita::NavigationDirection;
 use std::rc::Rc;
 
@@ -92,14 +93,18 @@ impl Navigation {
             ScreenName::User(id) => Box::new(self.screen_factory.make_user_details(id.to_owned())),
         };
 
-        let widget = component.get_root_widget();
+        let widget = component.get_root_widget().clone();
+        self.children.push(component);
 
         self.leaflet.navigate(NavigationDirection::Forward);
         self.navigation_stack
-            .add_named(widget, Some(name.identifier().as_ref()));
-        self.children.push(component);
+            .add_named(&widget, Some(name.identifier().as_ref()));
         self.navigation_stack
             .set_visible_child_name(name.identifier().as_ref());
+
+        glib::source::idle_add_local_once(move || {
+            widget.grab_focus();
+        });
     }
 
     fn pop(&mut self) {

diff --git a/src/app/components/search/search.rs b/src/app/components/search/search.rs
@@ -52,8 +52,13 @@ mod imp {
     }
 
     impl ObjectImpl for SearchResultsWidget {}
-    impl WidgetImpl for SearchResultsWidget {}
     impl BoxImpl for SearchResultsWidget {}
+
+    impl WidgetImpl for SearchResultsWidget {
+        fn grab_focus(&self, _: &Self::Type) -> bool {
+            self.search_entry.grab_focus()
+        }
+    }
 }
 
 glib::wrapper! {
@@ -222,6 +227,7 @@ impl EventListener for SearchResults {
     fn on_event(&mut self, app_event: &AppEvent) {
         match app_event {
             AppEvent::BrowserEvent(BrowserEvent::SearchUpdated) => {
+                self.get_root_widget().grab_focus();
                 self.update_search_query();
             }
             AppEvent::BrowserEvent(BrowserEvent::SearchResultsUpdated) => {

diff --git a/src/app/components/search/search.ui b/src/app/components/search/search.ui
@@ -3,6 +3,7 @@
   <requires lib="gtk" version="4.0" />
   <template class="SearchResultsWidget" parent="GtkBox">
     <property name="orientation">vertical</property>
+    <property name="can-focus">1</property>
     <child>
       <object class="AdwHeaderBar" id="main_header">
         <property name="show-end-title-buttons">1</property>
@@ -17,6 +18,7 @@
         <child type="title">
           <object class="GtkSearchEntry" id="search_entry">
             <property name="receives-default">1</property>
+            <property name="can-focus">1</property>
           </object>
         </child>
       </object>

diff --git a/src/app/components/search/search_model.rs b/src/app/components/search/search_model.rs
@@ -30,7 +30,7 @@ impl SearchResultsModel {
 
     fn get_query(&self) -> Option<impl Deref<Target = String> + '_> {
         self.app_model
-            .map_state_opt(|s| Some(&s.browser.search_state()?.query))
+            .map_state_opt(|s| Some(&s.browser.search_state()?.query).filter(|s| !s.is_empty()))
     }
 
     pub fn fetch_results(&self) {

diff --git a/src/main.rs b/src/main.rs
@@ -5,6 +5,7 @@ extern crate lazy_static;
 #[macro_use]
 extern crate log;
 
+use app::state::ScreenName;
 use futures::channel::mpsc::UnboundedSender;
 use gettextrs::*;
 use gio::prelude::*;
@@ -144,6 +145,12 @@ fn register_actions(app: &gtk::Application, sender: UnboundedSender<AppAction>)
     app.add_action(&make_action(
         "nav_pop",
         AppAction::BrowserAction(BrowserAction::NavigationPop),
+        sender.clone(),
+    ));
+
+    app.add_action(&make_action(
+        "search",
+        AppAction::BrowserAction(BrowserAction::NavigationPush(ScreenName::Search)),
         sender,
     ));
 }

diff --git a/src/window.ui.in b/src/window.ui.in
@@ -25,13 +25,13 @@
             </child>
             <child>
               <object class="GtkShortcut">
-                <property name="trigger">&lt;Alt&gt;P</property>
+                <property name="trigger">P</property>
                 <property name="action">action(app.player_prev)</property>
               </object>
             </child>
             <child>
               <object class="GtkShortcut">
-                <property name="trigger">&lt;Alt&gt;N</property>
+                <property name="trigger">N</property>
                 <property name="action">action(app.player_next)</property>
               </object>
             </child>
@@ -41,6 +41,12 @@
                 <property name="action">action(app.nav_pop)</property>
               </object>
             </child>
+            <child>
+              <object class="GtkShortcut">
+                <property name="trigger">&lt;Ctrl&gt;F</property>
+                <property name="action">action(app.search)</property>
+              </object>
+            </child>
           </object>
         </child>
         <child>
@@ -59,7 +65,6 @@
                         </binding>
                         <child>
                           <object class="GtkButton" id="search_button">
-                            <property name="receives-default">1</property>
                             <property name="icon-name">system-search-symbolic</property>
                           </object>
                         </child>
@@ -70,7 +75,6 @@
                         </child>
                         <child type="end">
                           <object class="GtkMenuButton" id="user">
-                            <property name="receives-default">1</property>
                             <property name="icon-name">open-menu-symbolic</property>
                           </object>
                         </child>