chore: refactor border rendering

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "zjstatus"
-version = "0.7.0"
+version = "0.8.0"
 authors = ["Daniel Jankowski"]
 edition = "2018"
 

src/border.rs

@@ -30,19 +30,8 @@ impl Default for BorderConfig {
 }
 
 impl BorderConfig {
-    pub fn draw_if_enabled(&self, cols: usize) {
-        if !self.enabled {
-            return;
-        }
-
-        let output = self.char.repeat(cols);
-
-        let mut newline = "";
-        if self.position == BorderPosition::Top {
-            newline = "\n";
-        }
-
-        print!("{}{}", self.format.format_string(output), newline);
+    pub fn draw(&self, cols: usize) -> String {
+        self.format.format_string(self.char.repeat(cols))
     }
 }
 

src/config.rs

@@ -188,17 +188,23 @@ impl ModuleConfig {
             );
         }
 
-        let mut newline = "";
+        let mut border_top = "".to_string();
+        if self.border.enabled && self.border.position == BorderPosition::Top {
+            border_top = format!("{}\n", self.border.draw(state.cols));
+        }
+
+        let mut border_bottom = "".to_string();
         if self.border.enabled && self.border.position == BorderPosition::Bottom {
-            newline = "\n";
+            border_bottom = format!("\n{}", self.border.draw(state.cols));
         }
 
         print!(
-            "{}{}{}{}",
+            "{}{}{}{}{}",
+            border_top,
             output_left,
             self.get_spacer(output_left.clone(), output_right.clone(), state.cols),
             output_right,
-            newline,
+            border_bottom,
         );
     }
 

src/main.rs

@@ -1,4 +1,3 @@
-use border::BorderPosition;
 use config::ModuleConfig;
 use widgets::{
     datetime::DateTimeWidget, mode::ModeWidget, session::SessionWidget,
@@ -121,16 +120,8 @@ impl ZellijPlugin for State {
     fn render(&mut self, _rows: usize, cols: usize) {
         self.state.cols = cols;
 
-        if self.module_config.border.position == BorderPosition::Top {
-            self.module_config.border.draw_if_enabled(cols);
-        }
-
         self.module_config
             .render_bar(self.state.clone(), self.widget_map.clone());
-
-        if self.module_config.border.position == BorderPosition::Bottom {
-            self.module_config.border.draw_if_enabled(cols);
-        }
     }
 }