Version 0.1.11, cleanup colorizing net graph

diff --git a/Cargo.lock b/Cargo.lock
index 6ed2418f8c0b11319538c3ca393156a970f6bf3e..9fca89391ef9b60e55739b33ffa5b2c30f84d9ea 100644 (file)
--- a/Cargo.lock
+++ b/Cargo.lock
@@ -141,7 +141,7 @@ dependencies = [
 
 [[package]]
 name = "swaybar_info"
-version = "0.1.10"
+version = "0.1.11"
 dependencies = [
  "chrono",
  "regex",

diff --git a/Cargo.toml b/Cargo.toml
index 75935d48f3fdf1d8ed32be15797be92413d50af4..45280c20577d6306b705caf533460b3ada56ddcd 100644 (file)
--- a/Cargo.toml
+++ b/Cargo.toml
@@ -1,6 +1,6 @@
 [package]
 name = "swaybar_info"
-version = "0.1.10"
+version = "0.1.11"
 edition = "2021"
 description = "Provides swaybar with info to be displayed"
 license = "MIT"

diff --git a/Changelog.md b/Changelog.md
index ea056b60bf5a4f63a1fa65143eb6a1896c42155f..7f1dda3a1df349f463e0574b6aa507c745f3265d 100644 (file)
--- a/Changelog.md
+++ b/Changelog.md
@@ -2,6 +2,10 @@
 
 ## Upcoming Changes
 
+## 0.1.11
+
+Use pango markup to colorize the netgraph, making it look cleaner.
+
 ## 0.1.10
 
 Colorize the netgraph based on if download or upload is greater.  

diff --git a/src/main.rs b/src/main.rs
index b706566403148b7740e1a41f4e624f3b8c19b109..4bfc0072dc71c89dd5fbb15dcfcba9dd3c49ee6f 100644 (file)
--- a/src/main.rs
+++ b/src/main.rs
@@ -224,31 +224,12 @@ fn main() {
             }
 
             if net_graph_max.is_some() || net_graph_is_dynamic {
-                for i in 0..net_graph_size.unwrap() {
-                    let mut graph_obj = SwaybarObject::from_string(
-                        "net_graph".to_owned() + &i.to_string(),
-                        " ".to_owned(),
-                    );
-                    if i == 0 {
-                        graph_obj.border_left = Some(1);
-                    } else {
-                        graph_obj.border_left = Some(0);
-                    }
-
-                    if i == net_graph_size.unwrap() - 1 {
-                        graph_obj.border_right = Some(1);
-                        graph_obj.separator_block_width = Some(12);
-                    } else {
-                        graph_obj.border_right = Some(0);
-                        graph_obj.separator_block_width = Some(0);
-                    }
-
-                    graph_obj.border_top = Some(1);
-                    graph_obj.border_bottom = Some(1);
-                    graph_obj.color = Some("#ffff88".into());
-                    graph_obj.separator = Some(false);
-                    array.push_object(graph_obj);
-                }
+                let mut graph_obj = SwaybarObject::from_string(
+                    "net_graph".to_owned(),
+                    " ".to_owned().repeat(net_graph_size.unwrap()),
+                );
+                graph_obj.markup = Some("pango".to_owned());
+                array.push_object(graph_obj);
             }
 
             let mut width_string: Option<String> = None;
@@ -301,20 +282,28 @@ fn main() {
             }
 
             if net_graph_max.is_some() || net_graph_is_dynamic {
-                for (idx, item) in graph_items.iter().enumerate() {
-                    let name = "net_graph".to_owned() + &idx.to_string();
-                    if let Some(graph_obj) = array.get_by_name_mut(&name) {
+                if let Some(graph_obj) = array.get_by_name_mut("net_graph") {
+                    let mut text = String::new();
+                    for item in graph_items.iter() {
                         match item.get_value_type() {
                             proc::GraphItemType::Download => {
-                                graph_obj.color = Some("#ff8888ff".into())
+                                text += &("<span color=\"#ff8888ff\">".to_owned()
+                                    + &item.get_value().to_string()
+                                    + "</span>");
                             }
                             proc::GraphItemType::Upload => {
-                                graph_obj.color = Some("#88ff88ff".into())
+                                text += &("<span color=\"#88ff88ff\">".to_owned()
+                                    + &item.get_value().to_string()
+                                    + "</span>");
+                            }
+                            proc::GraphItemType::Both => {
+                                text += &("<span color=\"#ffff88ff\">".to_owned()
+                                    + &item.get_value().to_string()
+                                    + "</span>");
                             }
-                            proc::GraphItemType::Both => graph_obj.color = Some("#ffff88ff".into()),
                         }
-                        graph_obj.full_text = item.get_value().into();
                     }
+                    graph_obj.full_text = text;
                 }
             }