Merge pull request #40 from AmionSky/ksni-separator

Add menu item separator for ksni
olback · Oct 18, 2023 · e3bd6c1 · e3bd6c1
2 parents 04ee1d0 + ba0d4ae
commit e3bd6c1
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 21 deletions.
diff --git a/Cargo.toml b/Cargo.toml
@@ -16,7 +16,7 @@ ksni = ["dep:ksni"]
 libappindicator = ["dep:libappindicator", "dep:gtk"]
 
 [dependencies]
-ksni = { version = "0.1.3", optional = true }
+ksni = { version = "0.2.0", optional = true }
 libappindicator = { version = "0.7", optional = true } # Tray icon
 gtk = { version = "0.15", optional = true }
 

diff --git a/src/api/linux_ksni/mod.rs b/src/api/linux_ksni/mod.rs
@@ -2,9 +2,13 @@ use crate::{TIError, IconSource};
 use ksni::{menu::StandardItem, Handle, Icon};
 use std::sync::Arc;
 
-struct TrayItem {
-    label: String,
-    action: Option<Arc<dyn Fn() + Send + Sync + 'static>>
+enum TrayItem {
+    Label(String),
+    MenuItem {
+        label: String,
+        action: Arc<dyn Fn() + Send + Sync + 'static>
+    },
+    Separator
 }
 
 struct Tray {
@@ -47,25 +51,25 @@ impl ksni::Tray for Tray {
     }
 
     fn menu(&self) -> Vec<ksni::MenuItem<Self>> {
-        self.actions.iter().map(|item| {
-            let action = item.action.clone();
-            if let Some(action) = action {
+        self.actions.iter().map(|item| match item {
+            TrayItem::Label(label) => StandardItem {
+                label: label.clone(),
+                enabled: false,
+                ..Default::default()
+            }
+            .into(),
+            TrayItem::MenuItem { label, action } => {
+                let action = action.clone();
                 StandardItem {
-                    label: item.label.clone(),
+                    label: label.clone(),
                     activate: Box::new(move |_| {
                         action();
                     }),
                     ..Default::default()
                 }
                 .into()
-            } else {
-                StandardItem {
-                    label: item.label.clone(),
-                    enabled: false,
-                    ..Default::default()
-                }
-                .into()
             }
+            TrayItem::Separator => ksni::MenuItem::Separator,
         }).collect()
     }
 }
@@ -96,10 +100,7 @@ impl TrayItemLinux {
 
     pub fn add_label(&mut self, label: &str) -> Result<(), TIError> {
         self.tray.update(move |tray| {
-            tray.actions.push(TrayItem {
-                label: label.to_string(),
-                action: None
-            });
+            tray.actions.push(TrayItem::Label(label.to_string()));
         });
 
         Ok(())
@@ -114,11 +115,19 @@ impl TrayItemLinux {
         });
 
         self.tray.update(move |tray| {
-            tray.actions.push(TrayItem {
+            tray.actions.push(TrayItem::MenuItem {
                 label: label.to_string(),
-                action: Some(action.clone())
+                action: action.clone()
             });
         });
         Ok(())
     }
+
+    pub fn add_separator(&mut self) -> Result<(), TIError> {
+        self.tray.update(move |tray| {
+            tray.actions.push(TrayItem::Separator);
+        });
+
+        Ok(())
+    }
 }