leyoda/cosmic-applets
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

status-area: Use struct instead of enum for IconUpdate

Browse source
This commit is contained in:
Ian Douglas Scott 2025-11-04 10:25:57 -08:00 • committed by Jacob Kauffmann
parent e2dcfeac7c
commit e7e275abf7
2 changed files with 27 additions and 42 deletions
Download patch file Download diff file Expand all files Collapse all files

12
cosmic-applet-status-area/src/components/status_menu.rs
View file

@ -61,12 +61,8 @@ impl State {
iced::Task::none() iced::Task::none()
} }
Msg::Icon(update) => { Msg::Icon(update) => {
match update { self.icon_name = update.name.unwrap_or_default();
IconUpdate::Name(name) => { self.icon_pixmap = update.pixmap.and_then(|icons| icons
self.icon_name = name;
}
IconUpdate::Pixmap(icons) => {
self.icon_pixmap = icons
.into_iter() .into_iter()
.max_by_key(|i| (i.width, i.height)) .max_by_key(|i| (i.width, i.height))
.map(|mut i| { .map(|mut i| {
@ -81,9 +77,7 @@ impl State {
pixel.rotate_left(1); pixel.rotate_left(1);
} }
icon::from_raster_pixels(i.width as u32, i.height as u32, i.bytes) icon::from_raster_pixels(i.width as u32, i.height as u32, i.bytes)
}); }));
}
}
iced::Task::none() iced::Task::none()
} }

25
cosmic-applet-status-area/src/subscriptions/status_notifier_item.rs
View file

@ -21,9 +21,9 @@ pub struct Icon {
} }
#[derive(Clone, Debug)] #[derive(Clone, Debug)]
pub enum IconUpdate { pub struct IconUpdate {
Name(String), pub name: Option<String>,
Pixmap(Vec<Icon>), pub pixmap: Option<Vec<Icon>>,
} }
impl StatusNotifierItem { impl StatusNotifierItem {
@ -93,22 +93,13 @@ impl StatusNotifierItem {
} }
pub fn icon_subscription(&self) -> iced::Subscription<IconUpdate> { pub fn icon_subscription(&self) -> iced::Subscription<IconUpdate> {
fn icon_events( async fn icon_events(item_proxy: StatusNotifierItemProxy<'static>) -> IconUpdate {
item_proxy: StatusNotifierItemProxy<'static>,
) -> impl futures::Stream<Item = IconUpdate> + 'static {
async move {
let icon_name = item_proxy.icon_name().await; let icon_name = item_proxy.icon_name().await;
let icon_pixmap = item_proxy.icon_pixmap().await; let icon_pixmap = item_proxy.icon_pixmap().await;
futures::stream::iter( IconUpdate {
[ name: icon_name.ok(),
icon_name.map(IconUpdate::Name), pixmap: icon_pixmap.ok(),
icon_pixmap.map(IconUpdate::Pixmap),
]
.into_iter()
.filter_map(Result::ok),
)
} }
.flatten_stream()
} }
let item_proxy = self.item_proxy.clone(); let item_proxy = self.item_proxy.clone();
@ -118,7 +109,7 @@ impl StatusNotifierItem {
let new_icon_stream = item_proxy.receive_new_icon().await.unwrap(); let new_icon_stream = item_proxy.receive_new_icon().await.unwrap();
futures::stream::once(async {}) futures::stream::once(async {})
.chain(new_icon_stream.map(|_| ())) .chain(new_icon_stream.map(|_| ()))
.flat_map(move |()| icon_events(item_proxy.clone())) .then(move |()| icon_events(item_proxy.clone()))
} }
.flatten_stream(), .flatten_stream(),
) )