Use lucide icons for shortcuts widget

Author: Exidex

Cargo.toml

@@ -26,8 +26,8 @@ edition = "2024"
 # iced
 #iced = { version = "0.13.99", features = ["wgpu", "tiny-skia", "web-colors", "tokio", "lazy", "advanced", "image", "svg"] }
 iced = { git = "https://github.com/project-gauntlet/iced.git", branch = "gauntlet-0.13.1", features = ["wgpu", "tiny-skia", "web-colors", "tokio", "lazy", "advanced", "image", "svg"] }
-#iced_fonts = { version = "0.2.99", features = ["bootstrap"] }
-iced_fonts =  { git = "https://github.com/project-gauntlet/iced_fonts.git", branch = "gauntlet-0.13.1", features = ["bootstrap"] }
+#iced_fonts = { version = "0.2.99", features = ["bootstrap", "lucide"] }
+iced_fonts =  { git = "https://github.com/project-gauntlet/iced_fonts.git", branch = "gauntlet-0.13.1", features = ["bootstrap", "lucide"] }
 
 # workspaces
 gauntlet-common = { path = "./rust/common" }

rust/client/src/ui/mod.rs

@@ -56,6 +56,7 @@ use iced::widget::text_input::focus;
 use iced::widget::themer;
 use iced::window;
 use iced_fonts::BOOTSTRAP_FONT_BYTES;
+use iced_fonts::LUCIDE_FONT_BYTES;
 
 use crate::model::UiViewEvent;
 use crate::ui::search_list::search_list;
@@ -300,6 +301,7 @@ pub fn run(minimized: bool, scenario_runner_data: Option<ScenarioRunnerData>) {
             ..Default::default()
         })
         .font(BOOTSTRAP_FONT_BYTES)
+        .font(LUCIDE_FONT_BYTES)
         .subscription(subscription)
         .theme(|state, _| state.theme.clone())
         .run()

rust/client/src/ui/widget/action_panel.rs

@@ -285,7 +285,7 @@ pub fn render_shortcut<'a, T: 'a>(shortcut: &PhysicalShortcut) -> Element<'a, T>
         modifier: Option<Element<'element, T>>,
     ) {
         if let Some(modifier) = modifier {
-            let modifier: Element<_> = container(modifier).themed(ContainerStyle::ActionShortcutModifier);
+            let modifier: Element<_> = container(modifier).center_y(Length::Fill).height(22).themed(ContainerStyle::ActionShortcutModifier);
 
             let modifier: Element<_> = container(modifier).themed(ContainerStyle::ActionShortcutModifiersInit);
 
@@ -298,7 +298,7 @@ pub fn render_shortcut<'a, T: 'a>(shortcut: &PhysicalShortcut) -> Element<'a, T>
     apply_modifier(&mut result, shift_modifier_text);
     apply_modifier(&mut result, alt_modifier_text);
 
-    let key_name: Element<_> = container(key_name).themed(ContainerStyle::ActionShortcutModifier);
+    let key_name: Element<_> = container(key_name).center_y(Length::Fill).height(22).themed(ContainerStyle::ActionShortcutModifier);
 
     result.push(key_name);
 

rust/common_ui/src/lib.rs

@@ -6,10 +6,11 @@ use iced::Pixels;
 use iced::border::Radius;
 use iced::keyboard::Modifiers;
 use iced::widget::text;
-use iced_fonts::bootstrap::arrow_return_left;
-use iced_fonts::bootstrap::command;
-use iced_fonts::bootstrap::option;
-use iced_fonts::bootstrap::shift;
+use iced_fonts::lucide::arrow_big_up;
+use iced_fonts::lucide::chevron_up;
+use iced_fonts::lucide::command;
+use iced_fonts::lucide::corner_down_left;
+use iced_fonts::lucide::option;
 
 pub fn padding(
     top: impl Into<Pixels>,
@@ -50,65 +51,63 @@ pub fn shortcut_to_text<'a, Message, Theme: text::Catalog + 'a>(
     let (key_name, show_shift) = match shortcut.physical_key {
         PhysicalKey::Enter => {
             let key_name = if cfg!(target_os = "macos") {
-                arrow_return_left().into()
+                corner_down_left().size(14).into()
             } else {
-                text("Enter").into()
+                text("Enter").size(15).into()
             };
 
             (key_name, shortcut.modifier_shift)
         }
         _ => {
             let (key_name, show_shift) = physical_key_name(&shortcut.physical_key, shortcut.modifier_shift);
 
-            let key_name: Element<_, _> = text(key_name).into();
+            let key_name: Element<_, _> = text(key_name).size(15).into();
 
             (key_name, show_shift)
         }
     };
 
     let alt_modifier_text = if shortcut.modifier_alt {
         if cfg!(target_os = "macos") {
-            Some(option().into())
+            Some(option().size(15).into())
         } else {
-            Some(text("Alt").into())
+            Some(text("Alt").size(15).into())
         }
     } else {
         None
     };
 
     let meta_modifier_text = if shortcut.modifier_meta {
         if cfg!(target_os = "macos") {
-            Some(command().into())
+            Some(command().size(13).into())
         } else if cfg!(target_os = "windows") {
             Some(
                 text("Win") // is it possible to have shortcuts that use win?
+                    .size(15)
                     .into(),
             )
         } else {
-            Some(text("Super").into())
+            Some(text("Super").size(15).into())
         }
     } else {
         None
     };
 
     let control_modifier_text = if shortcut.modifier_control {
         if cfg!(target_os = "macos") {
-            Some(
-                text("^") // TODO bootstrap doesn't have proper macos ctrl icon
-                    .into(),
-            )
+            Some(chevron_up().size(15).into())
         } else {
-            Some(text("Ctrl").into())
+            Some(text("Ctrl").size(15).into())
         }
     } else {
         None
     };
 
     let shift_modifier_text = if show_shift && shortcut.modifier_shift {
         if cfg!(target_os = "macos") {
-            Some(shift().into())
+            Some(arrow_big_up().size(17).into())
         } else {
-            Some(text("Shift").into())
+            Some(text("Shift").size(15).into())
         }
     } else {
         None

rust/server/src/plugins/js.rs

@@ -1,7 +1,6 @@
 use std::collections::HashMap;
 use std::fs::File;
 use std::sync::Arc;
-use std::time::Duration;
 use std::vec;
 
 use anyhow::Context;
@@ -1236,7 +1235,7 @@ async fn show_linux_native_hud(display: String) -> anyhow::Result<()> {
     proxy.add_notification(notification_id, notification).await?;
 
     tokio::spawn(async move {
-        tokio::time::sleep(Duration::from_secs(2)).await;
+        tokio::time::sleep(std::time::Duration::from_secs(2)).await;
         let _ = proxy.remove_notification(notification_id).await;
     });