Make all widgets use the bg color from Styles

dastarruer · dastarruer · commit a2d9084cf74e · 2026-02-14T20:17:21.000-04:00
diff --git a/src/canvas/components/data_table/draw.rs b/src/canvas/components/data_table/draw.rs
@@ -78,8 +78,13 @@ where
             self.styling.border_style
         };
 
-        let mut block = widget_block(self.props.is_basic, is_selected, self.styling.border_type)
-            .border_style(border_style);
+        let mut block = widget_block(
+            self.props.is_basic,
+            is_selected,
+            self.styling.border_type,
+            self.styling.bg_color_style,
+        )
+        .border_style(border_style);
 
         if let Some((left_title, right_title)) = self.generate_title(draw_info, data_len) {
             if !self.props.is_basic {
diff --git a/src/canvas/components/data_table/styling.rs b/src/canvas/components/data_table/styling.rs
@@ -11,6 +11,7 @@ pub struct DataTableStyling {
     pub text_style: Style,
     pub highlighted_text_style: Style,
     pub title_style: Style,
+    pub bg_color_style: Style,
 }
 
 impl DataTableStyling {
@@ -23,6 +24,7 @@ impl DataTableStyling {
             text_style: styles.text_style,
             highlighted_text_style: styles.selected_text_style,
             title_style: styles.widget_title_style,
+            bg_color_style: styles.bg_color_style,
         }
     }
 }
diff --git a/src/canvas/components/time_graph/base.rs b/src/canvas/components/time_graph/base.rs
@@ -64,6 +64,9 @@ pub struct TimeGraph<'a> {
     /// The graph style.
     pub graph_style: Style,
 
+    /// The background color
+    pub bg_color_style: Style,
+
     /// The border style.
     pub border_style: Style,
 
@@ -150,9 +153,14 @@ impl TimeGraph<'_> {
         let data = graph_data.into_iter().map(create_dataset).collect();
 
         let block = {
-            let mut b = widget_block(false, self.is_selected, self.border_type)
-                .border_style(self.border_style)
-                .title_top(Line::styled(self.title.as_ref(), self.title_style));
+            let mut b = widget_block(
+                false,
+                self.is_selected,
+                self.border_type,
+                self.bg_color_style,
+            )
+            .border_style(self.border_style)
+            .title_top(Line::styled(self.title.as_ref(), self.title_style));
 
             if self.is_expanded {
                 b = b.title_top(Line::styled(" Esc to go back ", self.title_style).right_aligned())
@@ -167,8 +175,8 @@ impl TimeGraph<'_> {
                 .x_axis(x_axis)
                 .y_axis(y_axis)
                 .marker(self.marker)
+                .style(self.bg_color_style)
                 .legend_style(self.graph_style)
-                .style(Style::default().bg(Color::Blue))
                 .legend_position(self.legend_position)
                 .hidden_legend_constraints(
                     self.legend_constraints
@@ -233,6 +241,7 @@ mod test {
             y_bounds: AxisBound::Max(100.5),
             y_labels: &Y_LABELS,
             graph_style: Style::default().fg(Color::Red),
+            bg_color_style: Style::default().bg(Color::Black),
             border_style: Style::default().fg(Color::Blue),
             border_type: BorderType::Plain,
             is_selected: false,
diff --git a/src/canvas/components/time_graph/variants/percent.rs b/src/canvas/components/time_graph/variants/percent.rs
@@ -35,7 +35,7 @@ pub(crate) struct PercentTimeGraph<'a> {
     pub(crate) current_widget: u64,
 
     /// Whether the current widget is expanded.
-    ///  
+    ///
     /// This is mostly used as a shared mutability workaround due to [`App`]
     /// being a giant state struct.
     pub(crate) is_expanded: bool,
@@ -70,7 +70,9 @@ impl<'a> PercentTimeGraph<'a> {
             Marker::Braille
         };
 
+        // Why are these declared as variables?
         let graph_style = self.styles.graph_style;
+        let bg_color_style = self.styles.bg_color_style;
         let border_style = get_border_style(self.styles, self.widget_id, self.current_widget);
         let title_style = self.styles.widget_title_style;
         let border_type = self.styles.border_type;
@@ -81,6 +83,7 @@ impl<'a> PercentTimeGraph<'a> {
             y_bounds: Y_BOUNDS,
             y_labels: &Y_LABELS,
             graph_style,
+            bg_color_style,
             border_style,
             border_type,
             title: self.title,
diff --git a/src/canvas/drawing_utils.rs b/src/canvas/drawing_utils.rs
@@ -1,7 +1,9 @@
 use std::time::Instant;
 
 use tui::{
-    layout::Rect, style::{Color, Style}, widgets::{Block, BorderType, Borders}
+    layout::Rect,
+    style::{Color, Style},
+    widgets::{Block, BorderType, Borders},
 };
 
 pub const SIDE_BORDERS: Borders = Borders::LEFT.union(Borders::RIGHT);
@@ -28,8 +30,12 @@ pub fn should_hide_x_label(
 }
 
 /// Return a widget block.
-pub fn widget_block(is_basic: bool, is_selected: bool, border_type: BorderType) -> Block<'static> {
-    let mut block = Block::default().border_type(border_type).style(Style::default().bg(Color::Blue));
+pub fn widget_block(
+    is_basic: bool, is_selected: bool, border_type: BorderType, bg_color: Style,
+) -> Block<'static> {
+    let mut block = Block::default()
+        .border_type(border_type)
+        .style(bg_color);
 
     if is_basic {
         if is_selected {
diff --git a/src/canvas/widgets/battery_display.rs b/src/canvas/widgets/battery_display.rs
@@ -51,6 +51,7 @@ impl Painter {
                     app_state.app_config_fields.use_basic_mode,
                     is_selected,
                     self.styles.border_type,
+                    self.styles.bg_color_style,
                 )
                 .border_style(border_style)
                 .title_top(Line::styled(" Battery ", self.styles.widget_title_style));
diff --git a/src/canvas/widgets/cpu_basic.rs b/src/canvas/widgets/cpu_basic.rs
@@ -35,8 +35,13 @@ impl Painter {
 
         if app_state.current_widget.widget_id == widget_id {
             f.render_widget(
-                widget_block(true, true, self.styles.border_type)
-                    .border_style(self.styles.highlighted_border_style),
+                widget_block(
+                    true,
+                    true,
+                    self.styles.border_type,
+                    self.styles.bg_color_style,
+                )
+                .border_style(self.styles.highlighted_border_style),
                 draw_loc,
             );
         }
diff --git a/src/canvas/widgets/mem_basic.rs b/src/canvas/widgets/mem_basic.rs
@@ -48,8 +48,13 @@ impl Painter {
 
         if app_state.current_widget.widget_id == widget_id {
             f.render_widget(
-                widget_block(true, true, self.styles.border_type)
-                    .border_style(self.styles.highlighted_border_style),
+                widget_block(
+                    true,
+                    true,
+                    self.styles.border_type,
+                    self.styles.bg_color_style,
+                )
+                .border_style(self.styles.highlighted_border_style),
                 draw_loc,
             );
         }
diff --git a/src/canvas/widgets/network_basic.rs b/src/canvas/widgets/network_basic.rs
@@ -34,8 +34,13 @@ impl Painter {
 
         if app_state.current_widget.widget_id == widget_id {
             f.render_widget(
-                widget_block(true, true, self.styles.border_type)
-                    .border_style(self.styles.highlighted_border_style),
+                widget_block(
+                    true,
+                    true,
+                    self.styles.border_type,
+                    self.styles.bg_color_style,
+                )
+                .border_style(self.styles.highlighted_border_style),
                 draw_loc,
             );
         }
diff --git a/src/canvas/widgets/network_graph.rs b/src/canvas/widgets/network_graph.rs
@@ -237,6 +237,7 @@ impl Painter {
                 y_bounds,
                 y_labels: &(y_labels.into_iter().map(Into::into).collect::<Vec<_>>()),
                 graph_style: self.styles.graph_style,
+                bg_color_style: self.styles.bg_color_style,
                 border_style,
                 border_type: self.styles.border_type,
                 title: " Network ".into(),
diff --git a/src/canvas/widgets/process_table.rs b/src/canvas/widgets/process_table.rs
@@ -254,8 +254,13 @@ impl Painter {
                 };
 
             let process_search_block = {
-                let mut block = widget_block(is_basic, is_selected, self.styles.border_type)
-                    .border_style(current_border_style);
+                let mut block = widget_block(
+                    is_basic,
+                    is_selected,
+                    self.styles.border_type,
+                    self.styles.bg_color_style,
+                )
+                .border_style(current_border_style);
 
                 if !is_basic {
                     block = block.title_top(
diff --git a/src/options/config/style.rs b/src/options/config/style.rs
@@ -20,12 +20,15 @@ use memory::MemoryStyle;
 use network::NetworkStyle;
 use serde::{Deserialize, Serialize};
 use tables::TableStyle;
-use tui::{style::Style, widgets::BorderType};
+use tui::{
+    style::{Color, Style},
+    widgets::BorderType,
+};
 use utils::{opt, set_colour, set_colour_list, set_style};
 use widgets::WidgetStyle;
 
 use super::Config;
-use crate::options::{OptionError, OptionResult, args::BottomArgs};
+use crate::options::{OptionError, OptionResult, args::BottomArgs, config::style::themes::hex};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[cfg_attr(feature = "generate_schema", derive(schemars::JsonSchema))]
@@ -151,6 +154,8 @@ impl Styles {
             palette.set_styles_from_config(config_style)?;
         }
 
+        // For testing
+        palette.bg_color_style = Style::default().bg(Color::White);
         Ok(palette)
     }
 

Original file line number	Diff line number	Diff line change
`@@ -11,6 +11,7 @@ pub struct DataTableStyling {`
`11`	`11`	`pub text_style: Style,`
`12`	`12`	`pub highlighted_text_style: Style,`
`13`	`13`	`pub title_style: Style,`
	`14`	`+ pub bg_color_style: Style,`
`14`	`15`	`}`
`15`	`16`
`16`	`17`	`impl DataTableStyling {`
`@@ -23,6 +24,7 @@ impl DataTableStyling {`
`23`	`24`	`text_style: styles.text_style,`
`24`	`25`	`highlighted_text_style: styles.selected_text_style,`
`25`	`26`	`title_style: styles.widget_title_style,`
	`27`	`+ bg_color_style: styles.bg_color_style,`
`26`	`28`	`}`
`27`	`29`	`}`
`28`	`30`	`}`
Original file line number	Diff line number	Diff line change
`@@ -51,6 +51,7 @@ impl Painter {`
`51`	`51`	`app_state.app_config_fields.use_basic_mode,`
`52`	`52`	`is_selected,`
`53`	`53`	`self.styles.border_type,`
	`54`	`+ self.styles.bg_color_style,`
`54`	`55`	`)`
`55`	`56`	`.border_style(border_style)`
`56`	`57`	`.title_top(Line::styled(" Battery ", self.styles.widget_title_style));`