Merge branch 'master' into windows-support

Author: unsecretised

src/app/tile/elm.rs

@@ -102,17 +102,7 @@ pub fn view(tile: &Tile, wid: window::Id) -> Element<'_, Message> {
             .on_input(move |a| Message::SearchQueryChanged(a, wid))
             .on_paste(move |a| Message::SearchQueryChanged(a, wid))
             .font(tile.config.theme.font())
-            .on_submit_maybe({
-                if !tile.results.is_empty() {
-                    match tile.results.first().unwrap().to_owned().open_command {
-                        AppCommand::Function(func) => Some(Message::RunFunction(func)),
-                        AppCommand::Message(msg) => Some(msg),
-                        AppCommand::Display => None,
-                    }
-                } else {
-                    None
-                }
-            })
+            .on_submit(Message::OpenFocused)
             .id("query")
             .width(Fill)
             .line_height(LineHeight::Relative(1.5))

src/app/tile/update.rs

@@ -121,7 +121,7 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                         height: 55. + DEFAULT_WINDOW_HEIGHT,
                     },
                 );
-            } else if tile.query_lc.split(" ").count() > 1 || tile.query_lc.ends_with("?") {
+            } else if tile.query_lc.ends_with("?") {
                 tile.results = vec![App {
                     open_command: AppCommand::Function(Function::GoogleSearch(tile.query.clone())),
                     icons: None,
@@ -162,6 +162,14 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                     name: "Open Website: ".to_string() + &tile.query,
                     name_lc: "".to_string(),
                 });
+            } else if tile.query_lc.split(' ').count() > 1 {
+                tile.results.push(App {
+                    open_command: AppCommand::Function(Function::GoogleSearch(tile.query.clone())),
+                    icons: None,
+                    desc: "Web Search".to_string(),
+                    name: format!("Search for: {}", tile.query),
+                    name_lc: String::new(),
+                });
             } else if tile.results.is_empty() && tile.query_lc == "lemon" {
                 #[cfg(target_os = "macos")]
                 tile.results.push(App {
@@ -251,7 +259,15 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                 open_command: AppCommand::Function(func),
                 ..
             }) => Task::done(Message::RunFunction(func.to_owned())),
-            Some(_) | None => Task::none(),
+            Some(App {
+                open_command: AppCommand::Message(msg),
+                ..
+            }) => Task::done(msg.to_owned()),
+            Some(App {
+                open_command: AppCommand::Display,
+                ..
+            }) => Task::done(Message::ReturnFocus),
+            None => Task::none(),
         },
 
         Message::ReloadConfig => {