Merge pull request #174 from unsecretised/better-shell-commands

Emoji and clipboard UI fixes

Author: unsecretised

src/app/pages/clipboard.rs

@@ -3,7 +3,10 @@ use iced::widget::{
     scrollable::{Direction, Scrollbar},
 };
 
-use crate::{app::pages::prelude::*, clipboard::ClipBoardContentType};
+use crate::{
+    app::{ToApp, pages::prelude::*},
+    clipboard::ClipBoardContentType,
+};
 
 pub fn clipboard_view(
     clipboard_content: Vec<ClipBoardContentType>,
@@ -43,6 +46,7 @@ pub fn clipboard_view(
                 horizontal: Scrollbar::new().scroller_width(0.).width(0.),
             },
         ))
+        .height(10000)
         .padding(10)
         .style(move |_| result_row_container_style(&theme_clone, false))
         .width((WINDOW_WIDTH / 3.) * 2.)

src/app/tile/update.rs

@@ -415,12 +415,28 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
                     display_name: format!("Search for: {}", tile.query),
                     search_name: String::new(),
                 }];
+                return single_item_resize_task(id);
             } else if tile.query_lc == "cbhist" {
                 task = task.chain(Task::done(Message::SwitchToPage(Page::ClipboardHistory)));
                 tile.page = Page::ClipboardHistory
             } else if tile.query_lc == "main" && tile.page != Page::Main {
                 task = task.chain(Task::done(Message::SwitchToPage(Page::Main)));
                 tile.page = Page::Main;
+            } else if tile.query_lc.starts_with(">") && tile.page == Page::Main {
+                tile.results = vec![App {
+                    ranking: 20,
+                    open_command: AppCommand::Function(Function::RunShellCommand(
+                        tile.query.strip_prefix(">").unwrap_or("").to_string(),
+                    )),
+                    display_name: format!(
+                        "Shell Command: {}",
+                        tile.query.strip_prefix(">").unwrap_or("")
+                    ),
+                    icons: None,
+                    search_name: "".to_string(),
+                    desc: "Shell Command".to_string(),
+                }];
+                return single_item_resize_task(id);
             }
             tile.handle_search_query_changed();
 
@@ -494,9 +510,9 @@ pub fn handle_update(tile: &mut Tile, message: Message) -> Task<Message> {
             if !tile.query_lc.is_empty() && tile.page == Page::EmojiSearch {
                 tile.results = tile
                     .emoji_apps
-                    .search_prefix("")
+                    .search_prefix(&tile.query_lc)
                     .map(|x| x.to_owned())
-                    .collect();
+                    .collect()
             }
 
             tile.results.sort_by_key(|x| -x.ranking);

src/clipboard.rs

@@ -1,7 +1,10 @@
 //! This has all the logic regarding the cliboard history
 use arboard::ImageData;
 
-use crate::{app::apps::App, commands::Function};
+use crate::{
+    app::{ToApp, apps::App},
+    commands::Function,
+};
 
 /// The kinds of clipboard content that rustcast can handle and their contents
 #[derive(Debug, Clone)]
@@ -10,10 +13,10 @@ pub enum ClipBoardContentType {
     Image(ImageData<'static>),
 }
 
-impl ClipBoardContentType {
+impl ToApp for ClipBoardContentType {
     /// Returns the iced element for rendering the clipboard item, and the entire content since the
     /// display name is only the first line
-    pub fn to_app(&self) -> App {
+    fn to_app(&self) -> App {
         let mut display_name = match self {
             ClipBoardContentType::Image(_) => "<img>".to_string(),
             ClipBoardContentType::Text(a) => a.to_owned(),