Merge pull request #837 from BowDown097/master

feat: icon overrides

src/modules/focused.rs

@@ -132,8 +132,6 @@ impl Module<gtk::Box> for FocusedModule {
         context: WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
         info: &ModuleInfo,
     ) -> Result<ModuleParts<gtk::Box>> {
-        let icon_theme = info.icon_theme;
-
         let container = gtk::Box::new(info.bar_position.orientation(), 5);
 
         let icon = gtk::Image::new();
@@ -152,10 +150,17 @@ impl Module<gtk::Box> for FocusedModule {
         container.add(&label);
 
         {
-            let icon_theme = icon_theme.clone();
+            let icon_overrides = info.icon_overrides.clone();
+            let icon_theme = info.icon_theme.clone();
+
             glib_recv!(context.subscribe(), data => {
-                if let Some((name, id)) = data {
+                if let Some((name, mut id)) = data {
                     if self.show_icon {
+
+                        if let Some(icon) = icon_overrides.get(&id) {
+                            id = icon.clone();
+                        }
+
                         match ImageProvider::parse(&id, &icon_theme, true, self.icon_size)
                             .map(|image| image.load_into_image(&icon))
                         {

src/modules/launcher/item.rs

@@ -24,16 +24,23 @@ pub struct Item {
     pub open_state: OpenState,
     pub windows: IndexMap<usize, Window>,
     pub name: String,
+    pub icon_override: String,
 }
 
 impl Item {
-    pub fn new(app_id: String, open_state: OpenState, favorite: bool) -> Self {
+    pub fn new(
+        app_id: String,
+        icon_override: String,
+        open_state: OpenState,
+        favorite: bool,
+    ) -> Self {
         Self {
             app_id,
             favorite,
             open_state,
             windows: IndexMap::new(),
             name: String::new(),
+            icon_override,
         }
     }
 
@@ -108,6 +115,7 @@ impl From<ToplevelInfo> for Item {
             open_state,
             windows,
             name,
+            icon_override: String::new(),
         }
     }
 }
@@ -167,7 +175,9 @@ impl ItemButton {
         }
 
         if appearance.show_icons {
-            let input = if item.app_id.is_empty() {
+            let input = if !item.icon_override.is_empty() {
+                item.icon_override.clone()
+            } else if item.app_id.is_empty() {
                 item.name.clone()
             } else {
                 item.app_id.clone()

src/modules/launcher/mod.rs

@@ -138,7 +138,7 @@ impl Module<gtk::Box> for LauncherModule {
 
     fn spawn_controller(
         &self,
-        _info: &ModuleInfo,
+        info: &ModuleInfo,
         context: &WidgetContext<Self::SendMessage, Self::ReceiveMessage>,
         mut rx: mpsc::Receiver<Self::ReceiveMessage>,
     ) -> crate::Result<()> {
@@ -149,18 +149,24 @@ impl Module<gtk::Box> for LauncherModule {
                 favorites
                     .iter()
                     .map(|app_id| {
+                        let icon_override = info
+                            .icon_overrides
+                            .get(app_id)
+                            .map_or_else(String::new, |v| v.to_string());
+
                         (
                             app_id.to_string(),
-                            Item::new(app_id.to_string(), OpenState::Closed, true),
+                            Item::new(app_id.to_string(), icon_override, OpenState::Closed, true),
                         )
                     })
                     .collect::<IndexMap<_, _>>()
             });
 
         let items = arc_mut!(items);
-
         let items2 = Arc::clone(&items);
 
+        let icon_overrides = info.icon_overrides.clone();
+
         let tx = context.tx.clone();
         let tx2 = context.tx.clone();
 
@@ -180,7 +186,13 @@ impl Module<gtk::Box> for LauncherModule {
                         item.merge_toplevel(info.clone());
                     }
                     None => {
-                        items.insert(info.app_id.clone(), Item::from(info.clone()));
+                        let mut item = Item::from(info.clone());
+
+                        if let Some(icon) = icon_overrides.get(&info.app_id) {
+                            item.icon_override = icon.clone();
+                        }
+
+                        items.insert(info.app_id.clone(), item);
                     }
                 }
             }
@@ -210,7 +222,11 @@ impl Module<gtk::Box> for LauncherModule {
                             let item = items.get_mut(&info.app_id);
                             match item {
                                 None => {
-                                    let item: Item = info.into();
+                                    let mut item: Item = info.into();
+
+                                    if let Some(icon) = icon_overrides.get(&app_id) {
+                                        item.icon_override = icon.clone();
+                                    }
 
                                     items.insert(app_id.clone(), item.clone());
 

src/modules/mod.rs

@@ -1,3 +1,4 @@
+use std::collections::HashMap;
 use std::fmt::Debug;
 use std::rc::Rc;
 use std::sync::Arc;
@@ -71,6 +72,7 @@ pub struct ModuleInfo<'a> {
     pub monitor: &'a Monitor,
     pub output_name: &'a str,
     pub icon_theme: &'a IconTheme,
+    pub icon_overrides: Arc<HashMap<String, String>>,
 }
 
 #[derive(Debug, Clone)]