feat(config): BorderType

Author: raylu

.config/config.toml

@@ -54,10 +54,6 @@ use_nerd_font_icons = false
 # └───────────────────────────────────────┘
 ui_scale = 100
 
-# Where to place the input bar in the UI (top or bottom)
-input_bar_position = "top"
-# The input prompt string (defaults to ">" if not specified)
-input_prompt = ">"
 # What orientation should tv be (landscape or portrait)
 orientation = "landscape"
 # The theme to use for the UI
@@ -100,6 +96,14 @@ remote_control = { enabled = true, visible = false }
 
 # Feature-specific configurations
 # Each feature can have its own configuration section
+[ui.input_bar]
+# Where to place the input bar in the UI (top or bottom)
+position = "top"
+# The input prompt string (defaults to ">" if not specified)
+prompt = ">"
+# header = "{}"
+border_type = "rounded" # https://docs.rs/ratatui/latest/ratatui/widgets/block/enum.BorderType.html#variants
+
 [ui.status_bar]
 # Status bar separators (bubble):
 #separator_open = ""
@@ -108,12 +112,16 @@ remote_control = { enabled = true, visible = false }
 separator_open = ""
 separator_close = ""
 
+[ui.results_panel]
+border_type = "rounded"
+
 [ui.preview_panel]
 # Preview panel size (percentage of screen width/height)
 size = 50
 #header = "{}"
 #footer = ""
 scrollbar = true
+border_type = "rounded"
 
 [ui.remote_control]
 # Whether to show channel descriptions in remote control mode

television/channels/prototypes.rs

@@ -1,8 +1,9 @@
 use crate::cli::parse_source_entry_delimiter;
+use crate::config::ui::InputBarConfig;
 use crate::{
     config::{Binding, KeyBindings, ui},
     features::Features,
-    screen::layout::{InputPosition, Orientation},
+    screen::layout::Orientation,
 };
 use anyhow::Result;
 use rustc_hash::FxHashMap;
@@ -379,16 +380,14 @@ pub struct UiSpec {
     // `layout` is clearer for the user but collides with the overall `Layout` type.
     #[serde(rename = "layout", alias = "orientation", default)]
     pub orientation: Option<Orientation>,
-    #[serde(default)]
-    pub input_bar_position: Option<InputPosition>,
-    #[serde(default)]
-    pub input_header: Option<Template>,
-    #[serde(default)]
-    pub input_prompt: Option<String>,
     // Feature-specific configurations
     #[serde(default)]
+    pub input_bar: Option<InputBarConfig>,
+    #[serde(default)]
     pub preview_panel: Option<ui::PreviewPanelConfig>,
     #[serde(default)]
+    pub results_panel: Option<ui::ResultsPanelConfig>,
+    #[serde(default)]
     pub status_bar: Option<ui::StatusBarConfig>,
     #[serde(default)]
     pub help_panel: Option<ui::HelpPanelConfig>,
@@ -404,10 +403,9 @@ impl From<&crate::config::UiConfig> for UiSpec {
             ui_scale: Some(config.ui_scale),
             features: Some(config.features.clone()),
             orientation: Some(config.orientation),
-            input_bar_position: Some(config.input_bar_position),
-            input_header: config.input_header.clone(),
-            input_prompt: Some(config.input_prompt.clone()),
+            input_bar: Some(config.input_bar.clone()),
             preview_panel: Some(config.preview_panel.clone()),
+            results_panel: Some(config.results_panel.clone()),
             status_bar: Some(config.status_bar.clone()),
             help_panel: Some(config.help_panel.clone()),
             remote_control: Some(config.remote_control.clone()),
@@ -417,7 +415,12 @@ impl From<&crate::config::UiConfig> for UiSpec {
 
 #[cfg(test)]
 mod tests {
-    use crate::{action::Action, config::Binding, event::Key};
+    use crate::{
+        action::Action,
+        config::{Binding, ui::BorderType},
+        event::Key,
+        screen::layout::InputPosition,
+    };
 
     use super::*;
     use toml::from_str;
@@ -500,16 +503,23 @@ mod tests {
         [ui]
         layout = "landscape"
         ui_scale = 100
-        input_bar_position = "bottom"
-        input_header = "Input: {}"
 
         [ui.features]
         preview_panel = { enabled = true, visible = true }
 
+        [ui.input_bar]
+        position = "bottom"
+        header = "Input: {}"
+        border_type = "plain"
+
         [ui.preview_panel]
         size = 66
         header = "Preview: {}"
         footer = "Press 'q' to quit"
+        border_type = "thick"
+
+        [ui.results_panel]
+        border_type = "none"
 
         [keybindings]
         quit = ["esc", "ctrl-c"]
@@ -552,29 +562,23 @@ mod tests {
         assert!(ui.features.is_some());
         let features = ui.features.as_ref().unwrap();
         assert!(features.preview_panel.enabled);
-        assert_eq!(ui.input_bar_position, Some(InputPosition::Bottom));
         assert_eq!(ui.preview_panel.as_ref().unwrap().size, 66);
-        assert_eq!(ui.input_header.as_ref().unwrap().raw(), "Input: {}");
+        let input_bar = ui.input_bar.as_ref().unwrap();
+        assert_eq!(input_bar.position, InputPosition::Bottom);
+        assert_eq!(input_bar.header.as_ref().unwrap().raw(), "Input: {}");
+        assert_eq!(input_bar.border_type, BorderType::Plain);
+        let preview_panel = ui.preview_panel.as_ref().unwrap();
         assert_eq!(
-            ui.preview_panel
-                .as_ref()
-                .unwrap()
-                .header
-                .as_ref()
-                .unwrap()
-                .raw(),
+            preview_panel.header.as_ref().unwrap().raw(),
             "Preview: {}"
         );
         assert_eq!(
-            ui.preview_panel
-                .as_ref()
-                .unwrap()
-                .footer
-                .as_ref()
-                .unwrap()
-                .raw(),
+            preview_panel.footer.as_ref().unwrap().raw(),
             "Press 'q' to quit"
         );
+        assert_eq!(preview_panel.border_type, BorderType::Thick);
+
+        assert_eq!(ui.results_panel.unwrap().border_type, BorderType::None);
 
         let keybindings = prototype.keybindings.unwrap();
         assert_eq!(
@@ -709,9 +713,8 @@ mod tests {
         assert_eq!(ui.orientation, Some(Orientation::Landscape));
         assert_eq!(ui.ui_scale, Some(40));
         assert!(ui.features.is_none());
-        assert!(ui.input_bar_position.is_none());
+        assert!(ui.input_bar.is_none());
         assert!(ui.preview_panel.is_some());
-        assert!(ui.input_header.is_none());
         assert_eq!(
             ui.preview_panel
                 .as_ref()

television/config/mod.rs

@@ -243,14 +243,14 @@ impl Config {
         if let Some(value) = ui_spec.orientation {
             self.ui.orientation = value;
         }
-        if let Some(value) = ui_spec.input_bar_position {
-            self.ui.input_bar_position = value;
-        }
 
         // Apply clone fields
         if let Some(value) = &ui_spec.features {
             self.ui.features = value.clone();
         }
+        if let Some(value) = &ui_spec.input_bar {
+            self.ui.input_bar = value.clone();
+        }
         if let Some(value) = &ui_spec.status_bar {
             self.ui.status_bar = value.clone();
         }
@@ -261,16 +261,6 @@ impl Config {
             self.ui.remote_control = value.clone();
         }
 
-        // Apply input_header
-        if let Some(value) = &ui_spec.input_header {
-            self.ui.input_header = Some(value.clone());
-        }
-
-        // Apply input_prompt
-        if let Some(value) = &ui_spec.input_prompt {
-            self.ui.input_prompt.clone_from(value);
-        }
-
         // Handle preview_panel with field merging
         if let Some(preview_panel) = &ui_spec.preview_panel {
             self.ui.preview_panel.size = preview_panel.size;
@@ -487,8 +477,8 @@ mod tests {
     }
 
     const USER_CONFIG_INPUT_PROMPT: &str = r#"
-        [ui]
-        input_prompt = "❯"
+        [ui.input_bar]
+        prompt = "❯"
     "#;
 
     #[test]
@@ -507,7 +497,7 @@ mod tests {
         let config = Config::new(&config_env, None).unwrap();
 
         // Verify that input_prompt was loaded from user config
-        assert_eq!(config.ui.input_prompt, "❯");
+        assert_eq!(config.ui.input_bar.prompt, "❯");
     }
 
     #[test]

television/config/themes.rs

@@ -232,7 +232,7 @@ struct Inner {
     // input
     input_text_fg: String,
     result_count_fg: String,
-    //results
+    // results
     result_name_fg: String,
     result_line_number_fg: String,
     result_value_fg: String,
@@ -241,9 +241,9 @@ struct Inner {
     // and falls back to match_fg
     selection_fg: Option<String>,
     match_fg: String,
-    //preview
+    // preview
     preview_title_fg: String,
-    //modes
+    // modes
     channel_mode_fg: String,
     channel_mode_bg: Option<String>,
     remote_control_mode_fg: String,

television/config/ui.rs

@@ -9,20 +9,47 @@ use serde::{Deserialize, Serialize};
 pub const DEFAULT_UI_SCALE: u16 = 100;
 pub const DEFAULT_PREVIEW_SIZE: u16 = 50;
 
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Hash)]
+#[serde(default)]
+pub struct InputBarConfig {
+    pub position: InputPosition,
+    pub header: Option<Template>,
+    pub prompt: String,
+    pub border_type: BorderType,
+}
+
+impl Default for InputBarConfig {
+    fn default() -> Self {
+        Self {
+            position: InputPosition::default(),
+            header: None,
+            prompt: ">".to_string(),
+            border_type: BorderType::default(),
+        }
+    }
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Hash, Default)]
 #[serde(default)]
 pub struct StatusBarConfig {
     pub separator_open: String,
     pub separator_close: String,
 }
 
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Hash, Default)]
+#[serde(default)]
+pub struct ResultsPanelConfig {
+    pub border_type: BorderType,
+}
+
 #[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Hash)]
 #[serde(default)]
 pub struct PreviewPanelConfig {
     pub size: u16,
     pub header: Option<Template>,
     pub footer: Option<Template>,
     pub scrollbar: bool,
+    pub border_type: BorderType,
 }
 
 impl Default for PreviewPanelConfig {
@@ -32,6 +59,7 @@ impl Default for PreviewPanelConfig {
             header: None,
             footer: None,
             scrollbar: true,
+            border_type: BorderType::default(),
         }
     }
 }
@@ -104,17 +132,15 @@ pub struct ThemeOverrides {
 pub struct UiConfig {
     pub use_nerd_font_icons: bool,
     pub ui_scale: u16,
-    pub input_bar_position: InputPosition,
     pub orientation: Orientation,
     pub theme: String,
-    pub input_header: Option<Template>,
-    #[serde(default = "default_input_prompt")]
-    pub input_prompt: String,
     pub features: Features,
 
     // Feature-specific configurations
+    pub input_bar: InputBarConfig,
     pub status_bar: StatusBarConfig,
     pub preview_panel: PreviewPanelConfig,
+    pub results_panel: ResultsPanelConfig,
     pub help_panel: HelpPanelConfig,
     pub remote_control: RemoteControlConfig,
 
@@ -123,27 +149,43 @@ pub struct UiConfig {
     pub theme_overrides: ThemeOverrides,
 }
 
-const DEFAULT_INPUT_PROMPT: &str = ">";
-fn default_input_prompt() -> String {
-    String::from(DEFAULT_INPUT_PROMPT)
-}
-
 impl Default for UiConfig {
     fn default() -> Self {
         Self {
             use_nerd_font_icons: false,
             ui_scale: DEFAULT_UI_SCALE,
-            input_bar_position: InputPosition::Top,
             orientation: Orientation::Landscape,
             theme: String::from(DEFAULT_THEME),
-            input_header: None,
-            input_prompt: String::from(DEFAULT_INPUT_PROMPT),
             features: Features::default(),
+            input_bar: InputBarConfig::default(),
             status_bar: StatusBarConfig::default(),
             preview_panel: PreviewPanelConfig::default(),
+            results_panel: ResultsPanelConfig::default(),
             help_panel: HelpPanelConfig::default(),
             remote_control: RemoteControlConfig::default(),
             theme_overrides: ThemeOverrides::default(),
         }
     }
 }
+
+#[derive(Clone, Debug, Deserialize, Serialize, PartialEq, Hash, Default)]
+#[serde(rename_all = "snake_case")]
+pub enum BorderType {
+    None,
+    Plain,
+    #[default]
+    Rounded,
+    Thick,
+}
+impl BorderType {
+    pub fn to_ratatui_border_type(
+        &self,
+    ) -> Option<ratatui::widgets::BorderType> {
+        match self {
+            BorderType::None => None,
+            BorderType::Plain => Some(ratatui::widgets::BorderType::Plain),
+            BorderType::Rounded => Some(ratatui::widgets::BorderType::Rounded),
+            BorderType::Thick => Some(ratatui::widgets::BorderType::Thick),
+        }
+    }
+}