update newer plugins to use styling struct

zellij-org · Nov 1, 2024 · 85445c6 · 85445c6
1 parent f944d62
commit 85445c6
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 24 deletions.
diff --git a/default-plugins/configuration/src/main.rs b/default-plugins/configuration/src/main.rs
@@ -71,7 +71,7 @@ struct State {
     ui_size: usize,
     current_screen: Screen,
     latest_mode_info: Option<ModeInfo>,
-    colors: Palette,
+    colors: Styling,
 }
 
 impl Default for State {
@@ -82,7 +82,7 @@ impl Default for State {
             ui_size: UI_SIZE,
             current_screen: Screen::default(),
             latest_mode_info: None,
-            colors: Palette::default(),
+            colors: Palette::default().into(),
         }
     }
 }

diff --git a/default-plugins/configuration/src/ui_components.rs b/default-plugins/configuration/src/ui_components.rs
@@ -1,11 +1,8 @@
 use crate::{Screen, WIDTH_BREAKPOINTS};
 use zellij_tile::prelude::*;
 
-pub fn top_tab_menu(cols: usize, current_screen: &Screen, colors: &Palette) {
-    let background = match colors.theme_hue {
-        ThemeHue::Dark => colors.black,
-        ThemeHue::Light => colors.white,
-    };
+pub fn top_tab_menu(cols: usize, current_screen: &Screen, colors: &Styling) {
+    let background = colors.text_unselected.background;
     let bg_color = match background {
         PaletteColor::Rgb((r, g, b)) => format!("\u{1b}[48;2;{};{};{}m\u{1b}[0K", r, g, b),
         PaletteColor::EightBit(color) => format!("\u{1b}[48;5;{}m\u{1b}[0K", color),

diff --git a/default-plugins/plugin-manager/src/main.rs b/default-plugins/plugin-manager/src/main.rs
@@ -34,7 +34,7 @@ pub struct NewPluginScreen {
     selected_config_index: Option<usize>,
     request_ids: Vec<String>,
     load_in_background: bool,
-    colors: Palette,
+    colors: Styling,
 }
 
 impl Default for NewPluginScreen {
@@ -50,13 +50,13 @@ impl Default for NewPluginScreen {
             selected_config_index: None,
             request_ids: vec![],
             load_in_background: true,
-            colors: Palette::default(),
+            colors: Palette::default().into(),
         }
     }
 }
 
 impl NewPluginScreen {
-    pub fn new(colors: Palette) -> Self {
+    pub fn new(colors: Styling) -> Self {
         Self {
             colors,
             ..Default::default()
@@ -261,10 +261,7 @@ impl NewPluginScreen {
             None,
             None,
         );
-        let background = match self.colors.theme_hue {
-            ThemeHue::Dark => self.colors.black,
-            ThemeHue::Light => self.colors.white,
-        };
+        let background = self.colors.text_unselected.background;
         let bg_color = match background {
             PaletteColor::Rgb((r, g, b)) => format!("\u{1b}[48;2;{};{};{}m\u{1b}[0K", r, g, b),
             PaletteColor::EightBit(color) => format!("\u{1b}[48;5;{}m\u{1b}[0K", color),
@@ -496,7 +493,7 @@ struct State {
     plugin_id_to_tab_position: HashMap<u32, usize>,
     search_term: String,
     new_plugin_screen: Option<NewPluginScreen>,
-    colors: Palette,
+    colors: Styling,
 }
 
 register_plugin!(State);

diff --git a/default-plugins/session-manager/src/main.rs b/default-plugins/session-manager/src/main.rs
@@ -122,10 +122,7 @@ impl ZellijPlugin for State {
     fn render(&mut self, rows: usize, cols: usize) {
         let (x, y, width, height) = self.main_menu_size(rows, cols);
 
-        let background = match self.colors.palette.theme_hue {
-            ThemeHue::Dark => self.colors.palette.black,
-            ThemeHue::Light => self.colors.palette.white,
-        };
+        let background = self.colors.palette.text_unselected.background;
 
         if self.is_welcome_screen {
             render_banner(x, 0, rows.saturating_sub(height), width);

diff --git a/default-plugins/status-bar/src/main.rs b/default-plugins/status-bar/src/main.rs
@@ -262,10 +262,7 @@ impl ZellijPlugin for State {
             ""
         };
 
-        let background = match self.mode_info.style.colors.theme_hue {
-            ThemeHue::Dark => self.mode_info.style.colors.black,
-            ThemeHue::Light => self.mode_info.style.colors.white,
-        };
+        let background = self.mode_info.style.colors.text_unselected.background;
 
         if rows == 1 && !self.classic_ui {
             let fill_bg = match background {
@@ -294,7 +291,6 @@ impl ZellijPlugin for State {
         let first_line = first_line(&self.mode_info, active_tab, cols, separator);
         let second_line = self.second_line(cols);
 
-        let background = self.mode_info.style.colors.text_unselected.background;
         // [48;5;238m is white background, [0K is so that it fills the rest of the line
         // [m is background reset, [0K is so that it clears the rest of the line
         match background {