Remove caching and prepare for tooltip support

cosmic-applet-status-area/src/components/status_menu.rs

@@ -9,13 +9,15 @@ use crate::subscriptions::status_notifier_item::{IconNameOrPixmap, Layout, Statu
 pub enum Msg {
     Icon(Option<IconNameOrPixmap>),
     Layout(Result<Layout, String>),
+    Tooltip(String),
     Click(i32, bool),
 }
 
 #[derive(Debug)]
 pub struct State {
     item: StatusNotifierItem,
     layout: Option<Layout>,
+    tooltip: String,
     icon: Option<IconNameOrPixmap>,
     expanded: Option<i32>,
 }
@@ -28,6 +30,7 @@ impl State {
                 layout: None,
                 expanded: None,
                 icon: None,
+                tooltip: Default::default(),
             },
             iced::Command::none(),
         )
@@ -39,6 +42,10 @@ impl State {
                 self.icon = icon;
                 iced::Command::none()
             }
+            Msg::Tooltip(tooltip) => {
+                self.tooltip = tooltip;
+                iced::Command::none()
+            }
             Msg::Layout(layout) => {
                 match layout {
                     Ok(layout) => {
@@ -72,11 +79,16 @@ impl State {
     }
 
     pub fn icon_handle(&self) -> icon::Handle {
-        self.icon.as_ref()
+        self.icon
+            .as_ref()
             .map(|i| i.clone().into())
             .unwrap_or_else(|| icon::from_raster_bytes(&[]))
     }
 
+    pub fn tooltip(&self) -> &str {
+        &self.tooltip
+    }
+
     pub fn popup_view(&self) -> cosmic::Element<Msg> {
         if let Some(layout) = self.layout.as_ref() {
             layout_view(layout, self.expanded)
@@ -88,6 +100,7 @@ impl State {
     pub fn subscription(&self) -> iced::Subscription<Msg> {
         let subs = vec![
             self.item.icon_subscription().map(Msg::Icon),
+            self.item.tooltip_subscription().map(Msg::Tooltip),
             self.item.layout_subscription().map(Msg::Layout),
         ];
 

cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs

@@ -10,7 +10,7 @@ pub struct StatusNotifierItem {
     name: String,
     // icon_name: String,
     // icon_pixmap: Option<icon::Handle>,
-    _item_proxy: StatusNotifierItemProxy<'static>,
+    item_proxy: StatusNotifierItemProxy<'static>,
     menu_proxy: DBusMenuProxy<'static>,
 }
 
@@ -52,7 +52,6 @@ impl StatusNotifierItem {
         };
 
         let item_proxy = StatusNotifierItemProxy::builder(connection)
-            .cache_properties(zbus::proxy::CacheProperties::Yes)
             .destination(dest.to_string())?
             .path(path.to_string())?
             .build()
@@ -67,7 +66,7 @@ impl StatusNotifierItem {
 
         Ok(Self {
             name,
-            _item_proxy: item_proxy,
+            item_proxy,
             menu_proxy,
         })
     }
@@ -77,9 +76,9 @@ impl StatusNotifierItem {
     }
 
     pub fn icon_subscription(&self) -> iced::Subscription<Option<IconNameOrPixmap>> {
-        let item_proxy = self._item_proxy.clone();
+        let item_proxy = self.item_proxy.clone();
         iced::subscription::run_with_id(
-            format!("status-notifier-newicon-{}", &self.name),
+            format!("status-notifier-icon-{}", &self.name),
             async move {
                 let initial = futures::stream::once(get_icon(item_proxy.clone()));
                 let updates = item_proxy
@@ -93,6 +92,20 @@ impl StatusNotifierItem {
         )
     }
 
+    pub fn tooltip_subscription(&self) -> iced::Subscription<String> {
+        let item_proxy = self.item_proxy.clone();
+        iced::subscription::run_with_id(
+            format!("status-notifier-tooltip-{}", &self.name),
+            async move {
+                let initial = futures::stream::once(get_tooltip(item_proxy.clone()));
+                let update_stream = item_proxy.receive_new_tooltip().await.unwrap();
+                let updates = update_stream.then(move |_| get_tooltip(item_proxy.clone()));
+                initial.chain(updates)
+            }
+            .flatten_stream()
+        )
+    }
+
     // TODO: Only fetch changed part of layout, if that's any faster
     pub fn layout_subscription(&self) -> iced::Subscription<Result<Layout, String>> {
         let menu_proxy = self.menu_proxy.clone();
@@ -120,20 +133,24 @@ async fn get_layout(menu_proxy: DBusMenuProxy<'static>) -> Result<Layout, String
     }
 }
 
-async fn get_icon(item_proxy: StatusNotifierItemProxy<'static>) -> Option<IconNameOrPixmap> {
-    if let Ok(pixmaps) = item_proxy.icon_pixmap().await {
-        // TODO Handle icon with multiple sizes?
-        return Some(IconNameOrPixmap::Pixmap(
-            pixmaps.into_iter().max_by_key(|i| (i.width, i.height))?,
-        ));
-    }
+async fn get_tooltip(item_proxy: StatusNotifierItemProxy<'static>) -> String {
+    item_proxy.tooltip().await.unwrap_or_default()
+}
 
+async fn get_icon(item_proxy: StatusNotifierItemProxy<'static>) -> Option<IconNameOrPixmap> {
     if let Ok(icon_name) = item_proxy.icon_name().await {
         if icon_name != "" {
             return Some(IconNameOrPixmap::Name(icon_name));
         }
     }
 
+    if let Ok(pixmaps) = item_proxy.icon_pixmap().await {
+        // TODO Handle icon with multiple sizes
+        return Some(IconNameOrPixmap::Pixmap(
+            pixmaps.into_iter().max_by_key(|i| (i.width, i.height))?,
+        ));
+    }
+
     None
 }
 
@@ -146,11 +163,23 @@ trait StatusNotifierItem {
     #[zbus(property)]
     fn icon_pixmap(&self) -> zbus::Result<Vec<Icon>>;
 
+    #[zbus(property)]
+    fn title(&self) -> zbus::Result<String>;
+
+    #[zbus(property)]
+    fn tooltip(&self) -> zbus::Result<String>;
+
     #[zbus(property)]
     fn menu(&self) -> zbus::Result<zvariant::OwnedObjectPath>;
 
+    #[zbus(signal)]
+    fn new_title(&self) -> zbus::Result<()>;
+
     #[zbus(signal)]
     fn new_icon(&self) -> zbus::Result<()>;
+
+    #[zbus(signal)]
+    fn new_tooltip(&self) -> zbus::Result<()>;
 }
 
 #[derive(Clone, Debug)]