WIP: add bg_colour to WidgetStyle

Author: dastarruer

src/options/config/style.rs

@@ -117,6 +117,7 @@ pub struct Styles {
     pub(crate) selected_text_style: Style,
     pub(crate) table_header_style: Style,
     pub(crate) widget_title_style: Style,
+    pub(crate) bg_color_style: Style,
     pub(crate) graph_style: Style,
     pub(crate) graph_legend_style: Style,
     pub(crate) high_battery: Style,
@@ -207,6 +208,7 @@ impl Styles {
         set_style!(self.graph_legend_style, config.graphs, legend_text);
 
         // General widget text.
+        set_colour!(self.bg_color_style, config.widgets, bg_color);
         set_style!(self.widget_title_style, config.widgets, widget_title);
         set_style!(self.text_style, config.widgets, text);
         set_style!(self.selected_text_style, config.widgets, selected_text);

src/options/config/style/themes/default.rs

@@ -59,6 +59,7 @@ impl Styles {
             selected_text_style: DEFAULT_SELECTED_TEXT_STYLE,
             table_header_style: color!(HIGHLIGHT_COLOUR).add_modifier(Modifier::BOLD),
             widget_title_style: color!(TEXT_COLOUR),
+            bg_color_style: Style::default(),
             graph_style: color!(TEXT_COLOUR),
             graph_legend_style: color!(TEXT_COLOUR),
             high_battery: color!(Color::Green),

src/options/config/style/themes/gruvbox.rs

@@ -1,5 +1,5 @@
 use tui::{
-    style::{Color, Modifier},
+    style::{Color, Modifier, Style},
     widgets::BorderType,
 };
 
@@ -58,6 +58,7 @@ impl Styles {
             text_style: hex!("#ebdbb2"),
             selected_text_style: hex!("#1d2021").bg(hex_colour!("#ebdbb2")),
             table_header_style: hex!("#83a598").add_modifier(Modifier::BOLD),
+            bg_color_style: Style::default(),
             widget_title_style: hex!("#ebdbb2"),
             graph_style: hex!("#ebdbb2"),
             graph_legend_style: hex!("#ebdbb2"),
@@ -123,6 +124,7 @@ impl Styles {
             text_style: hex!("#3c3836"),
             selected_text_style: hex!("#ebdbb2").bg(hex_colour!("#3c3836")),
             table_header_style: hex!("#076678").add_modifier(Modifier::BOLD),
+            bg_color_style: Style::default(),
             widget_title_style: hex!("#3c3836"),
             graph_style: hex!("#3c3836"),
             graph_legend_style: hex!("#3c3836"),

src/options/config/style/themes/nord.rs

@@ -1,5 +1,5 @@
 use tui::{
-    style::{Color, Modifier},
+    style::{Color, Modifier, Style},
     widgets::BorderType,
 };
 
@@ -46,6 +46,7 @@ impl Styles {
             text_style: hex!("#e5e9f0"),
             selected_text_style: hex!("#2e3440").bg(hex_colour!("#88c0d0")),
             table_header_style: hex!("#81a1c1").add_modifier(Modifier::BOLD),
+            bg_color_style: Style::default(),
             widget_title_style: hex!("#e5e9f0"),
             graph_style: hex!("#e5e9f0"),
             graph_legend_style: hex!("#e5e9f0"),
@@ -99,6 +100,7 @@ impl Styles {
             text_style: hex!("#2e3440"),
             selected_text_style: hex!("#f5f5f5").bg(hex_colour!("#5e81ac")),
             table_header_style: hex!("#5e81ac").add_modifier(Modifier::BOLD),
+            bg_color_style: Style::default(),
             widget_title_style: hex!("#2e3440"),
             graph_style: hex!("#2e3440"),
             graph_legend_style: hex!("#2e3440"),

src/options/config/style/utils.rs

@@ -96,8 +96,8 @@ fn convert_name_to_colour(color_name: &str) -> Result<Color, String> {
         "white" => Ok(Color::White),
         _ => Err(format!(
             "'{color_name}' is an invalid named color.
-            
-The following are supported named colors: 
+
+The following are supported named colors:
 +--------+-------------+---------------------+
 |  Reset | Magenta     | Light Yellow        |
 +--------+-------------+---------------------+

src/options/config/style/widgets.rs

@@ -33,4 +33,7 @@ pub(crate) struct WidgetStyle {
 
     /// Widget borders type.
     pub(crate) widget_border_type: Option<WidgetBorderType>,
+
+    /// Background color for widgets in general
+    pub(crate) bg_color: Option<ColorStr>,
 }