diff --git a/Cargo.lock b/Cargo.lock index c90d25d..fbe4aa4 100644 --- a/Cargo.lock +++ b/Cargo.lock @@ -2060,7 +2060,7 @@ dependencies = [ [[package]] name = "k-launcher" -version = "0.2.0" +version = "0.2.1" dependencies = [ "ctrlc", "dirs", @@ -2084,7 +2084,7 @@ dependencies = [ [[package]] name = "k-launcher-config" -version = "0.2.0" +version = "0.2.1" dependencies = [ "dirs", "k-launcher-domain", @@ -2096,7 +2096,7 @@ dependencies = [ [[package]] name = "k-launcher-domain" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "serde", @@ -2104,7 +2104,7 @@ dependencies = [ [[package]] name = "k-launcher-kernel" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "futures", @@ -2118,7 +2118,7 @@ dependencies = [ [[package]] name = "k-launcher-os-bridge" -version = "0.2.0" +version = "0.2.1" dependencies = [ "k-launcher-domain", "libc", @@ -2127,7 +2127,7 @@ dependencies = [ [[package]] name = "k-launcher-plugin-host" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "k-launcher-domain", @@ -2140,7 +2140,7 @@ dependencies = [ [[package]] name = "k-launcher-ui" -version = "0.2.0" +version = "0.2.1" dependencies = [ "iced", "k-launcher-config", @@ -2153,7 +2153,7 @@ dependencies = [ [[package]] name = "k-launcher-ui-core" -version = "0.2.0" +version = "0.2.1" dependencies = [ "k-launcher-config", "k-launcher-domain", @@ -2162,7 +2162,7 @@ dependencies = [ [[package]] name = "k-launcher-ui-egui" -version = "0.2.0" +version = "0.2.1" dependencies = [ "eframe", "egui", @@ -3168,7 +3168,7 @@ checksum = "b4596b6d070b27117e987119b4dac604f3c58cfb0b191112e24771b2faeac1a6" [[package]] name = "plugin-apps" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "bincode", @@ -3186,7 +3186,7 @@ dependencies = [ [[package]] name = "plugin-calc" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "evalexpr", @@ -3196,7 +3196,7 @@ dependencies = [ [[package]] name = "plugin-cmd" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "k-launcher-domain", @@ -3205,7 +3205,7 @@ dependencies = [ [[package]] name = "plugin-files" -version = "0.2.0" +version = "0.2.1" dependencies = [ "async-trait", "k-launcher-domain", @@ -3214,7 +3214,7 @@ dependencies = [ [[package]] name = "plugin-url" -version = "0.2.0" +version = "0.2.1" dependencies = [ "serde", "serde_json", diff --git a/contrib/PKGBUILD b/contrib/PKGBUILD index bae2f0b..df25010 100644 --- a/contrib/PKGBUILD +++ b/contrib/PKGBUILD @@ -3,7 +3,7 @@ # Copy this file as PKGBUILD to your AUR repo pkgname=k-launcher -pkgver=0.2.0 +pkgver=0.2.1 pkgrel=1 pkgdesc='Wayland command palette launcher with fuzzy search, frecency, and plugin support' arch=('x86_64') diff --git a/crates/k-launcher-config/Cargo.toml b/crates/k-launcher-config/Cargo.toml index 127ce5e..a4b8bdf 100644 --- a/crates/k-launcher-config/Cargo.toml +++ b/crates/k-launcher-config/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-config" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/k-launcher-config/src/types.rs b/crates/k-launcher-config/src/types.rs index ca12d5a..30b2b90 100644 --- a/crates/k-launcher-config/src/types.rs +++ b/crates/k-launcher-config/src/types.rs @@ -93,7 +93,10 @@ pub struct AppearanceCfg { pub row_radius: f32, pub placeholder: String, pub selected_row_rgba: Rgba, + pub selected_text_rgba: Rgba, + pub selected_description_rgba: Rgba, pub unselected_row_rgba: Rgba, + pub text_rgba: Rgba, pub description_rgba: Rgba, pub no_results_rgba: Rgba, pub error_rgba: Rgba, @@ -113,7 +116,10 @@ impl Default for AppearanceCfg { row_radius: 4.0, placeholder: "Search apps, type > for commands, = for math".to_string(), selected_row_rgba: Rgba::new(229.0, 125.0, 33.0, 1.0), + selected_text_rgba: Rgba::new(255.0, 255.0, 255.0, 1.0), + selected_description_rgba: Rgba::new(240.0, 240.0, 240.0, 0.9), unselected_row_rgba: Rgba::new(255.0, 255.0, 255.0, 0.07), + text_rgba: Rgba::new(255.0, 255.0, 255.0, 1.0), description_rgba: Rgba::new(210.0, 215.0, 230.0, 1.0), no_results_rgba: Rgba::new(180.0, 180.0, 200.0, 0.5), error_rgba: Rgba::new(255.0, 80.0, 80.0, 1.0), diff --git a/crates/k-launcher-domain/Cargo.toml b/crates/k-launcher-domain/Cargo.toml index 2d977ec..7664969 100644 --- a/crates/k-launcher-domain/Cargo.toml +++ b/crates/k-launcher-domain/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-domain" -version = "0.2.0" +version = "0.2.1" edition = "2024" [dependencies] diff --git a/crates/k-launcher-kernel/Cargo.toml b/crates/k-launcher-kernel/Cargo.toml index 5b0ca05..ea8de49 100644 --- a/crates/k-launcher-kernel/Cargo.toml +++ b/crates/k-launcher-kernel/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-kernel" -version = "0.2.0" +version = "0.2.1" edition = "2024" [dependencies] diff --git a/crates/k-launcher-os-bridge/Cargo.toml b/crates/k-launcher-os-bridge/Cargo.toml index c8bb1ba..af0baaf 100644 --- a/crates/k-launcher-os-bridge/Cargo.toml +++ b/crates/k-launcher-os-bridge/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-os-bridge" -version = "0.2.0" +version = "0.2.1" edition = "2024" [dependencies] diff --git a/crates/k-launcher-plugin-host/Cargo.toml b/crates/k-launcher-plugin-host/Cargo.toml index 91c724c..ee46be2 100644 --- a/crates/k-launcher-plugin-host/Cargo.toml +++ b/crates/k-launcher-plugin-host/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-plugin-host" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/k-launcher-ui-core/Cargo.toml b/crates/k-launcher-ui-core/Cargo.toml index 4f11f29..5615402 100644 --- a/crates/k-launcher-ui-core/Cargo.toml +++ b/crates/k-launcher-ui-core/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-ui-core" -version = "0.2.0" +version = "0.2.1" edition = "2024" [dependencies] diff --git a/crates/k-launcher-ui-egui/Cargo.toml b/crates/k-launcher-ui-egui/Cargo.toml index b3e3be7..4922345 100644 --- a/crates/k-launcher-ui-egui/Cargo.toml +++ b/crates/k-launcher-ui-egui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-ui-egui" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/k-launcher-ui-egui/src/render.rs b/crates/k-launcher-ui-egui/src/render.rs index dfbfd25..16cbbf6 100644 --- a/crates/k-launcher-ui-egui/src/render.rs +++ b/crates/k-launcher-ui-egui/src/render.rs @@ -43,14 +43,25 @@ pub fn render_result_list( } fn render_result_row(ui: &mut Ui, result: &SearchResult, is_selected: bool, cfg: &AppearanceCfg) { + let title_color = if is_selected { + to_color32(&cfg.selected_text_rgba) + } else { + to_color32(&cfg.text_rgba) + }; + let desc_color = if is_selected { + to_color32(&cfg.selected_description_rgba) + } else { + to_color32(&cfg.description_rgba) + }; + style::result_row_frame(is_selected, cfg).show(ui, |ui| { ui.set_width(ui.available_width()); ui.horizontal(|ui| { ui.add_space(8.0); ui.vertical(|ui| { - ui.label(result.title.as_str()); + ui.colored_label(title_color, result.title.as_str()); if let Some(desc) = &result.description { - ui.colored_label(to_color32(&cfg.description_rgba), desc.as_ref()); + ui.colored_label(desc_color, desc.as_ref()); } }); }); diff --git a/crates/k-launcher-ui/Cargo.toml b/crates/k-launcher-ui/Cargo.toml index 9e606c0..bb6becb 100644 --- a/crates/k-launcher-ui/Cargo.toml +++ b/crates/k-launcher-ui/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher-ui" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/k-launcher-ui/src/view.rs b/crates/k-launcher-ui/src/view.rs index af07121..4ef8ab7 100644 --- a/crates/k-launcher-ui/src/view.rs +++ b/crates/k-launcher-ui/src/view.rs @@ -113,9 +113,12 @@ fn result_row<'a>( }; container( - row![result_icon(&result.icon, cfg), title_column(result, cfg)] - .spacing(style::CONTENT_SPACING) - .align_y(iced::Center), + row![ + result_icon(&result.icon, cfg), + title_column(result, is_selected, cfg) + ] + .spacing(style::CONTENT_SPACING) + .align_y(iced::Center), ) .width(Length::Fill) .padding(style::ROW_PADDING) @@ -138,17 +141,35 @@ fn result_icon<'a>(icon_path: &'a Option>, cfg: &AppearanceCfg) -> Elem } } -fn title_column<'a>(result: &'a SearchResult, cfg: &AppearanceCfg) -> Element<'a, Message> { +fn title_column<'a>( + result: &'a SearchResult, + is_selected: bool, + cfg: &AppearanceCfg, +) -> Element<'a, Message> { + let title_color = if is_selected { + style::rgba(&cfg.selected_text_rgba) + } else { + style::rgba(&cfg.text_rgba) + }; + let desc_color = if is_selected { + style::rgba(&cfg.selected_description_rgba) + } else { + style::rgba(&cfg.description_rgba) + }; + if let Some(desc) = &result.description { column![ - text(result.title.as_str()).size(cfg.title_size), - text(desc.as_ref()) - .size(cfg.desc_size) - .color(style::rgba(&cfg.description_rgba)), + text(result.title.as_str()) + .size(cfg.title_size) + .color(title_color), + text(desc.as_ref()).size(cfg.desc_size).color(desc_color), ] .into() } else { - text(result.title.as_str()).size(cfg.title_size).into() + text(result.title.as_str()) + .size(cfg.title_size) + .color(title_color) + .into() } } diff --git a/crates/k-launcher/Cargo.toml b/crates/k-launcher/Cargo.toml index 7e2d117..25b026c 100644 --- a/crates/k-launcher/Cargo.toml +++ b/crates/k-launcher/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "k-launcher" -version = "0.2.0" +version = "0.2.1" edition = "2024" default-run = "k-launcher" diff --git a/crates/plugins/plugin-apps/Cargo.toml b/crates/plugins/plugin-apps/Cargo.toml index a584cea..0e95f14 100644 --- a/crates/plugins/plugin-apps/Cargo.toml +++ b/crates/plugins/plugin-apps/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plugin-apps" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/plugins/plugin-calc/Cargo.toml b/crates/plugins/plugin-calc/Cargo.toml index 1f17647..0d620a4 100644 --- a/crates/plugins/plugin-calc/Cargo.toml +++ b/crates/plugins/plugin-calc/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plugin-calc" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/plugins/plugin-cmd/Cargo.toml b/crates/plugins/plugin-cmd/Cargo.toml index e6cd994..b45cea2 100644 --- a/crates/plugins/plugin-cmd/Cargo.toml +++ b/crates/plugins/plugin-cmd/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plugin-cmd" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/plugins/plugin-files/Cargo.toml b/crates/plugins/plugin-files/Cargo.toml index 87a46ea..cab4739 100644 --- a/crates/plugins/plugin-files/Cargo.toml +++ b/crates/plugins/plugin-files/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plugin-files" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/crates/plugins/plugin-url/Cargo.toml b/crates/plugins/plugin-url/Cargo.toml index f6a9882..6d2f0af 100644 --- a/crates/plugins/plugin-url/Cargo.toml +++ b/crates/plugins/plugin-url/Cargo.toml @@ -1,6 +1,6 @@ [package] name = "plugin-url" -version = "0.2.0" +version = "0.2.1" edition = "2024" [lib] diff --git a/man/k-launcher.1 b/man/k-launcher.1 index 4e5d6d5..fff5065 100644 --- a/man/k-launcher.1 +++ b/man/k-launcher.1 @@ -1,4 +1,4 @@ -.TH K\-LAUNCHER 1 "2026-07-24" "k-launcher 0.2.0" "User Commands" +.TH K\-LAUNCHER 1 "2026-07-24" "k-launcher 0.2.1" "User Commands" .SH NAME k\-launcher \- Wayland command palette launcher .SH SYNOPSIS