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

chore: update dependencies and debian changelog

Browse source
This commit is contained in:
Michael Aaron Murphy 2026-01-13 17:21:37 +01:00 • committed by Ashley Wulber
parent 7998dffb5d
commit f06c6a0b80
26 changed files with 362 additions and 358 deletions
Download patch file Download diff file Expand all files Collapse all files

16
cosmic-applet-status-area/src/components/app.rs
View file

@ -567,21 +567,7 @@ fn menu_icon_button<'a>(
applet: &'a cosmic::applet::Context,
menu: &'a status_menu::State,
) -> cosmic::widget::Button<'a, Msg> {
match (menu.icon_pixmap(), menu.icon_name(), menu.icon_theme_path()) {
(Some(icon), "", _) => applet.icon_button_from_handle(icon.clone().symbolic(true)),
(_, name, Some(theme_path)) if name != "" => {
let mut path = theme_path.to_owned();
// XXX right way to lookup icon in dir?
path.push(name.to_owned() + ".svg");
if !path.exists() {
path.pop();
path.push(name.to_owned() + ".png");
}
let icon = cosmic::widget::icon::from_path(path).symbolic(true);
applet.icon_button_from_handle(icon)
}
(_, name, _) => applet.icon_button(name),
}
applet.icon_button_from_handle(menu.icon_handle().clone())
}
pub fn main() -> iced::Result {

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

@ -24,10 +24,8 @@ pub struct State {
pub item: StatusNotifierItem,
layout: Option<Layout>,
expanded: Option<i32>,
icon_name: String,
// TODO handle icon with multiple sizes?
icon_pixmap: Option<icon::Handle>,
icon_theme_path: Option<PathBuf>,
icon_handle: icon::Handle,
click_event: Option<(i32, bool)>,
}
@ -38,9 +36,9 @@ impl State {
item,
layout: None,
expanded: None,
icon_name: String::new(),
icon_pixmap: None,
icon_theme_path: None,
icon_handle: icon::from_name("application-default")
.prefer_svg(true)
.handle(),
click_event: None,
},
iced::Task::none(),
@ -64,25 +62,42 @@ impl State {
iced::Task::none()
}
Msg::Icon(update) => {
self.icon_name = update.name.unwrap_or_default();
self.icon_pixmap = update.pixmap.and_then(|icons| icons
.into_iter()
.max_by_key(|i| (i.width, i.height))
.map(|mut i| {
if i.width <= 0 || i.height <= 0 || i.bytes.is_empty() {
// App sent invalid icon data during initialization - show placeholder until NewIcon signal
eprintln!("Skipping invalid icon: {}x{} with {} bytes, app may still be initializing",
i.width, i.height, i.bytes.len());
return icon::from_name("dialog-question").symbolic(true).handle();
}
// Convert ARGB to RGBA
for pixel in i.bytes.chunks_exact_mut(4) {
pixel.rotate_left(1);
}
icon::from_raster_pixels(i.width as u32, i.height as u32, i.bytes)
}));
self.icon_theme_path = update.theme_path;
let icon_name = update.name.unwrap_or_default();
// Use the icon pixmap if an icon was not defined by name.
if icon_name.is_empty() {
let icon_pixmap = update.pixmap.and_then(|icons| icons
.into_iter()
.max_by_key(|i| (i.width, i.height))
.map(|mut i| {
if i.width <= 0 || i.height <= 0 || i.bytes.is_empty() {
// App sent invalid icon data during initialization - show placeholder until NewIcon signal
eprintln!("Skipping invalid icon: {}x{} with {} bytes, app may still be initializing",
i.width, i.height, i.bytes.len());
return icon::from_name("dialog-question").symbolic(true).handle();
}
// Convert ARGB to RGBA
for pixel in i.bytes.chunks_exact_mut(4) {
pixel.rotate_left(1);
}
icon::from_raster_pixels(i.width as u32, i.height as u32, i.bytes)
}));
if let Some(icon) = icon_pixmap {
self.icon_handle = icon.clone();
return iced::Task::none();
}
}
// If the defined icon is a path, load the icon by path.
if Path::new(&icon_name).exists() {
self.icon_handle =
icon::from_path(Path::new(&icon_name).to_path_buf()).symbolic(true);
return iced::Task::none();
}
// Load the icon by name from a system icon theme.
self.icon_handle = icon::from_name(icon_name).prefer_svg(true).handle();
iced::Task::none()
}
Msg::Click(id, is_submenu) => {
@ -134,16 +149,8 @@ impl State {
self.item.name()
}
pub fn icon_name(&self) -> &str {
&self.icon_name
}
pub fn icon_pixmap(&self) -> Option<&icon::Handle> {
self.icon_pixmap.as_ref()
}
pub fn icon_theme_path(&self) -> Option<&Path> {
self.icon_theme_path.as_deref()
pub fn icon_handle(&self) -> &icon::Handle {
&self.icon_handle
}
pub fn popup_view(&self) -> cosmic::Element<'_, Msg> {