adds bold property on label & button (#74)

qxb3 · Feb 7, 2025 · e6e7fec · e6e7fec
1 parent 9dc8516
commit e6e7fec
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 7 deletions.
diff --git a/src/config/defaults.rs b/src/config/defaults.rs
@@ -60,13 +60,15 @@ pub fn layout() -> Vec<FumWidget> {
                     text: "$title".to_string(),
                     align: LabelAlignment::Center,
                     truncate: true,
+                    bold: false,
                     bg: None,
                     fg: None
                 },
                 FumWidget::Label {
                     text: "$artists".to_string(),
                     align: LabelAlignment::Center,
                     truncate: true,
+                    bold: false,
                     bg: None,
                     fg: None
                 },
@@ -89,6 +91,7 @@ pub fn layout() -> Vec<FumWidget> {
                             text: "󰒮".to_string(),
                             action: Some(Action::Prev),
                             exec: None,
+                            bold: false,
                             bg: None,
                             fg: None
                         },
@@ -97,6 +100,7 @@ pub fn layout() -> Vec<FumWidget> {
                             text: "$status_icon".to_string(),
                             action: Some(Action::PlayPause),
                             exec: None,
+                            bold: false,
                             bg: None,
                             fg: None
                         },
@@ -105,6 +109,7 @@ pub fn layout() -> Vec<FumWidget> {
                             text: "󰒭".to_string(),
                             action: Some(Action::Next),
                             exec: None,
+                            bold: false,
                             bg: None,
                             fg: None
                         }
@@ -138,13 +143,15 @@ pub fn layout() -> Vec<FumWidget> {
                             text: "$position".to_string(),
                             align: LabelAlignment::Left,
                             truncate: false,
+                            bold: false,
                             bg: None,
                             fg: None
                         },
                         FumWidget::Label {
                             text: "$length".to_string(),
                             align: LabelAlignment::Right,
                             truncate: false,
+                            bold: false,
                             bg: None,
                             fg: None
                         }

diff --git a/src/widget/button.rs b/src/widget/button.rs
@@ -1,11 +1,11 @@
-use ratatui::{buffer::Buffer, layout::Rect, style::Stylize, widgets::{Block, Paragraph, Widget}};
+use ratatui::{buffer::Buffer, layout::Rect, style::{Modifier, Stylize}, widgets::{Block, Paragraph, Widget}};
 
 use crate::{get_color, state::FumState, text::replace_text};
 
 use super::FumWidget;
 
 pub fn render(widget: &FumWidget, area: Rect, buf: &mut Buffer, state: &mut FumState) {
-    if let FumWidget::Button { id, text, action, exec, bg, fg } = widget {
+    if let FumWidget::Button { id, text, action, exec, bold, bg, fg } = widget {
         let text = replace_text(text, state).to_string();
 
         state.buttons.insert(
@@ -15,12 +15,19 @@ pub fn render(widget: &FumWidget, area: Rect, buf: &mut Buffer, state: &mut FumS
 
         let (bg, fg) = get_color!(bg, fg, &state.parent_bg, &state.parent_fg);
 
+        // Whether the text is bold
+        let bold = match bold {
+            true => Modifier::BOLD,
+            false => Modifier::default()
+        };
+
         // Render bg
         Block::new()
             .bg(*bg)
             .render(area, buf);
 
         Paragraph::new(text)
+            .add_modifier(bold)
             .fg(*fg)
             .render(area, buf);
     }

diff --git a/src/widget/label.rs b/src/widget/label.rs
@@ -1,22 +1,28 @@
-use ratatui::{buffer::Buffer, layout::Rect, style::Stylize, widgets::{Block, Paragraph, Widget}};
+use ratatui::{buffer::Buffer, layout::Rect, style::{Modifier, Stylize}, widgets::{Block, Paragraph, Widget}};
 
 use crate::{get_color, state::FumState, text::replace_text, utils};
 
 use super::{FumWidget, LabelAlignment};
 
 pub fn render(widget: &FumWidget, area: Rect, buf: &mut Buffer, state: &mut FumState) {
-    if let FumWidget::Label { text, truncate, align, bg, fg } = widget {
+    if let FumWidget::Label { text, truncate, align, bold, bg, fg } = widget {
         let text = match truncate {
             true => utils::etc::truncate(&replace_text(text, state), area.width.into()),
             false => replace_text(text, state)
         };
 
         let (bg, fg) = get_color!(bg, fg, &state.parent_bg, &state.parent_fg);
 
+        // Whether the text is bold
+        let bold = match bold {
+            true => Modifier::BOLD,
+            false => Modifier::default()
+        };
+
         let widget = match align {
-            LabelAlignment::Left => Paragraph::new(text).left_aligned().fg(*fg),
-            LabelAlignment::Center => Paragraph::new(text).centered().fg(*fg),
-            LabelAlignment::Right => Paragraph::new(text).right_aligned().fg(*fg),
+            LabelAlignment::Left => Paragraph::new(text).left_aligned().fg(*fg).add_modifier(bold),
+            LabelAlignment::Center => Paragraph::new(text).centered().fg(*fg).add_modifier(bold),
+            LabelAlignment::Right => Paragraph::new(text).right_aligned().fg(*fg).add_modifier(bold),
         };
 
         // Render bg

diff --git a/src/widget/widget.rs b/src/widget/widget.rs
@@ -7,6 +7,7 @@ use super::{button, container, cover_art, empty, label, progress, volume};
 
 fn default_truncate() -> bool { true }
 fn default_border() -> bool { false }
+fn default_bold() -> bool { false }
 
 #[derive(Debug, Clone, Deserialize)]
 #[serde(rename_all = "lowercase")]
@@ -146,6 +147,8 @@ pub enum FumWidget {
         align: LabelAlignment,
         #[serde(default = "default_truncate")]
         truncate: bool,
+        #[serde(default = "default_bold")]
+        bold: bool,
         bg: Option<Color>,
         fg: Option<Color>
     },
@@ -155,6 +158,8 @@ pub enum FumWidget {
         text: String,
         action: Option<Action>,
         exec: Option<String>,
+        #[serde(default = "default_bold")]
+        bold: bool,
         bg: Option<Color>,
         fg: Option<Color>
     },