Read background color from config

Author: dastarruer

src/options/config/style.rs

@@ -28,7 +28,7 @@ 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::utils::set_bg_colour};
 
 #[derive(Clone, Debug, Deserialize, Serialize)]
 #[cfg_attr(feature = "generate_schema", derive(schemars::JsonSchema))]
@@ -154,8 +154,6 @@ impl Styles {
             palette.set_styles_from_config(config_style)?;
         }
 
-        // For testing
-        palette.bg_color_style = Style::default().bg(Color::White);
         Ok(palette)
     }
 
@@ -213,6 +211,7 @@ impl Styles {
         set_style!(self.graph_legend_style, config.graphs, legend_text);
 
         // General widget text.
+        set_bg_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/utils.rs

@@ -233,6 +233,27 @@ macro_rules! set_colour {
     };
 }
 
+macro_rules! set_bg_colour {
+    ($palette_field:expr, $config_location:expr, $field:tt) => {
+        if let Some(colour) = &(opt!($config_location.as_ref()?.$field.as_ref())) {
+            $palette_field = $palette_field.bg(
+                crate::options::config::style::utils::str_to_colour(&colour.0).map_err(|err| {
+                    match stringify!($config_location).split_once(".") {
+                        Some((_, loc)) => crate::options::OptionError::config(format!(
+                            "Please update 'styles.{loc}.{}' in your config file. {err}",
+                            stringify!($field)
+                        )),
+                        None => crate::options::OptionError::config(format!(
+                            "Please update 'styles.{}' in your config file. {err}",
+                            stringify!($field)
+                        )),
+                    }
+                })?,
+            );
+        }
+    };
+}
+
 /// Set `palette_field` to the value in `config_location` for `field`.
 macro_rules! set_colour_list {
     ($palette_field:expr, $config_location:expr, $field:tt) => {
@@ -259,6 +280,7 @@ macro_rules! set_colour_list {
 }
 
 pub(super) use opt;
+pub(super) use set_bg_colour;
 pub(super) use set_colour;
 pub(super) use set_colour_list;
 pub(super) use set_style;