From 7fe7dd53c079d86fd4d037429428dc4f5536efa3 Mon Sep 17 00:00:00 2001 From: Pablo Ovelleiro Corral Date: Thu, 8 Aug 2024 02:33:15 +0200 Subject: [PATCH] Make prompt symbol configurable --- client/src/component/divider.rs | 1 - client/src/component/query_input.rs | 10 +++++----- client/src/settings.rs | 2 ++ 3 files changed, 7 insertions(+), 6 deletions(-) diff --git a/client/src/component/divider.rs b/client/src/component/divider.rs index a3cce62..7c02324 100644 --- a/client/src/component/divider.rs +++ b/client/src/component/divider.rs @@ -1,7 +1,6 @@ use crate::Settings; pub fn view() -> iced::Element<'static, crate::Message> { - let font_size = Settings::get_or_init().font.size; iced::widget::column![iced::widget::horizontal_rule(1)] .padding(iced::Padding::from([ diff --git a/client/src/component/query_input.rs b/client/src/component/query_input.rs index 5722313..547b70c 100644 --- a/client/src/component/query_input.rs +++ b/client/src/component/query_input.rs @@ -2,12 +2,12 @@ use crate::Settings; pub const SEARCH_INPUT_ID: &str = "search_input"; pub fn view(query: &str, add_horizontal_rule: bool) -> iced::Element<'static, crate::Message> { - let font_size = Settings::get_or_init().font.size; + let prompt_symbol = &Settings::get_or_init().font.prompt_symbol; + let mut view = iced::widget::column![iced::widget::row![ - iced::widget::container(iced::widget::text("󰍉 ").size(1.3 * font_size)).padding( - iced::Padding::from([0.2 * font_size, -0.3 * font_size, 0., 0.]) - ), + iced::widget::container(iced::widget::text(prompt_symbol).size(font_size)) + .padding(iced::Padding::from([0.14 * font_size, 0., 0., 0.])), iced::widget::text_input("Search", query) .id(iced::widget::text_input::Id::new(SEARCH_INPUT_ID)) .on_input(crate::Message::Search) @@ -15,7 +15,7 @@ pub fn view(query: &str, add_horizontal_rule: bool) -> iced::Element<'static, cr .style(style()) ] .padding(iced::Padding::from([0.8 * font_size, 1.2 * font_size])),] - .padding(iced::Padding::from([0., 0., 1., 0.])); + .padding(iced::Padding::from([0., 0., 2., 0.])); if add_horizontal_rule { view = view.push(iced::widget::horizontal_rule(1)); diff --git a/client/src/settings.rs b/client/src/settings.rs index c67b362..e43415d 100644 --- a/client/src/settings.rs +++ b/client/src/settings.rs @@ -120,6 +120,7 @@ pub struct GitRepositoriesPluginSettings { pub struct FontSettings { pub default: String, pub size: f32, + pub prompt_symbol: String, } #[derive(Debug, Deserialize)] @@ -134,6 +135,7 @@ impl Default for FontSettings { Self { default: "FiraCode Nerd Font".to_string(), size: 14.0, + prompt_symbol: "$".to_string(), } } }