feat(tray): option to prefer theme-provided icons

JakeStanger · Mar 29, 2024 · ba00445 · ba00445
1 parent 004ea76
commit ba00445
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 10 deletions.
diff --git a/docs/modules/Tray.md b/docs/modules/Tray.md
@@ -1,16 +1,16 @@
-Displays a fully interactive icon tray using the KDE `libappindicator` protocol. 
+Displays a fully interactive icon tray using the KDE `libappindicator` protocol.
 
 ![Screenshot showing icon tray widget](https://user-images.githubusercontent.com/5057870/184540135-78ffd79d-f802-4c79-b09a-05a733dadc55.png)
 
 ## Configuration
 
 > Type: `tray`
 
-
-| Name        | Type      | Default                                                         | Description                                                                                                              |
-|-------------|-----------|-----------------------------------------------------------------|--------------------------------------------------------------------------------------------------------------------------|
-| `direction` | `string`  | `left_to_right` if bar is horizontal, `top_to_bottom` otherwise | Direction to display the tray items. Possible values: `top_to_bottom`, `bottom_to_top`, `left_to_right`, `right_to_left` |
-| `icon_size` | `integer` | `16`                                                            | Size in pixels to display tray icons as                                                                                  |
+| Name                 | Type      | Default                                                         | Description                                                                                                                                                         |
+|----------------------|-----------|-----------------------------------------------------------------|---------------------------------------------------------------------------------------------------------------------------------------------------------------------|
+| `direction`          | `string`  | `left_to_right` if bar is horizontal, `top_to_bottom` otherwise | Direction to display the tray items. Possible values: `top_to_bottom`, `bottom_to_top`, `left_to_right`, `right_to_left`                                            |
+| `icon_size`          | `integer` | `16`                                                            | Size in pixels to display tray icons as.                                                                                                                            |
+| `prefer_theme_icons` | `bool`    | `true`                                                          | Requests that icons from the theme be used over the item-provided item. Most items only provide one or the other so this will have no effect in most circumstances. |
 
 <details>
 <summary>JSON</summary>
@@ -55,12 +55,12 @@ end:
 
 ```corn
 {
-  end = [
+end = [
     {
-      type = "tray"
-      direction = "top_to_bottom"
+    type = "tray"
+    direction = "top_to_bottom"
     }
-  ]
+    ]
 }
 ```
 

diff --git a/src/modules/tray/mod.rs b/src/modules/tray/mod.rs
@@ -20,6 +20,9 @@ use tracing::{debug, error, warn};
 
 #[derive(Debug, Deserialize, Clone)]
 pub struct TrayModule {
+    #[serde(default = "crate::config::default_true")]
+    prefer_theme_icons: bool,
+
     #[serde(default = "default_icon_size")]
     icon_size: u32,