Merge pull request #1260 from JakeStanger/fix/ipc-popup2

More IPC popup fixes

Author: JakeStanger

src/ipc/server/bar.rs

@@ -2,8 +2,6 @@ use super::Response;
 use crate::Ironbar;
 use crate::bar::Bar;
 use crate::ipc::{BarCommand, BarCommandType};
-use glib::prelude::Cast;
-use gtk::Button;
 use std::rc::Rc;
 
 pub fn handle_command(command: &BarCommand, ironbar: &Rc<Ironbar>) -> Response {
@@ -60,7 +58,7 @@ pub fn handle_command(command: &BarCommand, ironbar: &Rc<Ironbar>) -> Response {
                 values.push(v);
                 Response::Multi { values }
             }
-            _ => unreachable!(),
+            (acc, _) => acc,
         })
         .unwrap_or(Response::error("Invalid bar name"))
 }
@@ -78,11 +76,13 @@ fn show_popup(bar: &Bar, widget_name: &str) -> Response {
 
     let module_ref = bar.modules().iter().find(|m| m.name == widget_name);
 
-    let module_button = module_ref.and_then(|m| m.widget.downcast_ref::<Button>());
+    let module_button = module_ref
+        .and_then(|m| m.popup.clone())
+        .and_then(|popup| popup.buttons.first().cloned());
 
     match (module_ref, module_button) {
         (Some(module_ref), Some(button)) => {
-            if popup.show_for(module_ref.id, button) {
+            if popup.show_for(module_ref.id, &button) {
                 Response::Ok
             } else {
                 Response::error("Module has no popup functionality")

src/ipc/server/style.rs

@@ -52,7 +52,7 @@ pub fn handle_command(command: StyleCommand, ironbar: &Ironbar) -> Response {
             }
 
             for module in modules {
-                if module.widget.has_css_class(&name) {
+                if module.root_widget.has_css_class(&name) {
                     module.remove_css_class(&name);
                 } else {
                     module.add_css_class(&name);
@@ -73,18 +73,18 @@ fn modules_by_name<'a>(bars: &'a [Bar], name: &str) -> Vec<&'a ModuleRef> {
 
 impl ModuleRef {
     fn add_css_class(&self, name: &str) {
-        self.widget.add_css_class(name);
+        self.root_widget.add_css_class(name);
 
         if let Some(ref popup) = self.popup {
-            popup.add_css_class(name);
+            popup.container.add_css_class(name);
         }
     }
 
     fn remove_css_class(&self, name: &str) {
-        self.widget.remove_css_class(name);
+        self.root_widget.remove_css_class(name);
 
         if let Some(ref popup) = self.popup {
-            popup.remove_css_class(name);
+            popup.container.remove_css_class(name);
         }
     }
 }

src/modules/launcher/mod.rs

@@ -20,6 +20,7 @@ use gtk::prelude::*;
 use gtk::{Button, Orientation};
 use indexmap::IndexMap;
 use serde::Deserialize;
+use std::rc::Rc;
 use std::sync::Arc;
 use tokio::sync::mpsc;
 use tracing::{debug, error, trace, warn};
@@ -588,7 +589,7 @@ impl Module<gtk::Box> for LauncherModule {
 
         let popup = self
             .into_popup(context, info)
-            .into_popup_parts_with_finder(Box::new(move |id| {
+            .into_popup_parts_with_finder(Rc::new(move |id| {
                 buttons
                     .borrow()
                     .values()

src/modules/mod.rs

@@ -144,8 +144,8 @@ where
 pub struct ModuleRef {
     pub id: usize,
     pub name: String,
-    pub widget: Widget,
-    pub popup: Option<gtk::Box>,
+    pub root_widget: Widget,
+    pub popup: Option<ModulePopupParts>,
 }
 
 pub struct ModuleParts<W: IsA<Widget>> {
@@ -182,14 +182,15 @@ impl<W: IsA<Widget>> ModuleParts<W> {
     }
 }
 
+#[derive(Clone)]
 pub struct ModulePopupParts {
     /// The popup container, with all its contents
     pub container: gtk::Box,
     /// An array of buttons which can be used for opening the popup.
     /// For most modules, this will only be a single button.
     pub buttons: Vec<Button>,
 
-    pub button_finder: Option<Box<ButtonFinder>>,
+    pub button_finder: Option<Rc<ButtonFinder>>,
 }
 
 impl Debug for ModulePopupParts {
@@ -206,7 +207,7 @@ pub trait ModulePopup {
     fn into_popup_parts(self, buttons: Vec<&Button>) -> Option<ModulePopupParts>;
     fn into_popup_parts_owned(self, buttons: Vec<Button>) -> Option<ModulePopupParts>;
 
-    fn into_popup_parts_with_finder(self, finder: Box<ButtonFinder>) -> Option<ModulePopupParts>;
+    fn into_popup_parts_with_finder(self, finder: Rc<ButtonFinder>) -> Option<ModulePopupParts>;
 }
 
 impl ModulePopup for Option<gtk::Box> {
@@ -222,7 +223,7 @@ impl ModulePopup for Option<gtk::Box> {
         })
     }
 
-    fn into_popup_parts_with_finder(self, finder: Box<ButtonFinder>) -> Option<ModulePopupParts> {
+    fn into_popup_parts_with_finder(self, finder: Rc<ButtonFinder>) -> Option<ModulePopupParts> {
         self.map(|container| ModulePopupParts {
             container,
             buttons: vec![],
@@ -354,8 +355,7 @@ pub trait ModuleFactory {
 
         module_parts.setup_identifiers(&common);
 
-        let popup_container = module_parts.popup.as_ref().map(|p| p.container.clone());
-        if let Some(popup_content) = module_parts.popup {
+        if let Some(popup_content) = module_parts.popup.clone() {
             popup_content
                 .container
                 .add_css_class(&format!("popup-{module_name}"));
@@ -375,8 +375,8 @@ pub trait ModuleFactory {
         Ok(ModuleRef {
             id,
             name: instance_name,
-            widget: module_parts.widget.upcast(),
-            popup: popup_container,
+            root_widget: module_parts.widget.upcast(),
+            popup: module_parts.popup,
         })
     }
 

src/popup.rs

@@ -26,7 +26,7 @@ pub type ButtonFinder = dyn Fn(usize) -> Option<Button> + 'static;
 pub struct Popup {
     pub popover: Popover,
     pub container_cache: Rc<RefCell<HashMap<usize, PopupCacheValue>>>,
-    pub button_finder_cache: Rc<RefCell<HashMap<usize, Box<ButtonFinder>>>>,
+    pub button_finder_cache: Rc<RefCell<HashMap<usize, Rc<ButtonFinder>>>>,
     pub button_cache: Rc<RefCell<Vec<Button>>>,
     pos: BarPosition,
     current_widget: Rc<RefCell<Option<CurrentWidgetInfo>>>,
@@ -108,7 +108,7 @@ impl Popup {
         if let Some(button_finder) = content.button_finder {
             self.button_finder_cache
                 .borrow_mut()
-                .insert(key, Box::new(button_finder));
+                .insert(key, button_finder);
         }
     }
 
@@ -117,10 +117,8 @@ impl Popup {
         self.button_cache.borrow_mut().push(button);
     }
 
-    pub fn register_button_finder(&self, key: usize, finder: Box<ButtonFinder>) {
-        self.button_finder_cache
-            .borrow_mut()
-            .insert(key, Box::new(finder));
+    pub fn register_button_finder(&self, key: usize, finder: Rc<ButtonFinder>) {
+        self.button_finder_cache.borrow_mut().insert(key, finder);
     }
 
     pub fn unregister_button(&self, button: &Button) {