zedfrigg/ironbar
1
0
Fork 0
mirror of https://github.com/Zedfrigg/ironbar.git synced 2025-08-17 06:41:03 +02:00
Code Activity

feat(tray): icon size setting

Browse source
This commit is contained in:
Jake Stanger 2024-02-25 17:13:28 +00:00
parent 18e8244580
commit 72440e69c9
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
3 changed files with 39 additions and 17 deletions
Download patch file Download diff file Expand all files Collapse all files

20
src/modules/tray/mod.rs
View file

@ -18,12 +18,20 @@ use tokio::sync::mpsc;
#[derive(Debug, Deserialize, Clone)]
pub struct TrayModule {
#[serde(default = "default_icon_size")]
icon_size: u32,
#[serde(default, deserialize_with = "deserialize_orientation")]
pub direction: Option<PackDirection>,
direction: Option<PackDirection>,
#[serde(flatten)]
pub common: Option<CommonConfig>,
}
const fn default_icon_size() -> u32 {
16
}
fn deserialize_orientation<'de, D>(deserializer: D) -> Result<Option<PackDirection>, D::Error>
where
D: serde::Deserializer<'de>,
@ -106,7 +114,7 @@ impl Module<MenuBar> for TrayModule {
// listen for UI updates
glib_recv!(context.subscribe(), update =>
on_update(update, &container, &mut menus, &icon_theme, &context.controller_tx)
on_update(update, &container, &mut menus, &icon_theme, self.icon_size, &context.controller_tx)
);
};
@ -124,6 +132,7 @@ fn on_update(
container: &MenuBar,
menus: &mut HashMap<Box<str>, TrayMenu>,
icon_theme: &IconTheme,
icon_size: u32,
tx: &mpsc::Sender<NotifierItemCommand>,
) {
match update {
@ -148,11 +157,10 @@ fn on_update(
}
if item.icon_name.as_ref() != menu_item.icon_name() {
match icon::get_image_from_icon_name(&item, icon_theme)
.or_else(|| icon::get_image_from_pixmap(&item))
match icon::get_image(&item, icon_theme, icon_size)
{
Some(image) => menu_item.set_image(&image),
None => menu_item.set_label(label),
Ok(image) => menu_item.set_image(&image),
Err(_) => menu_item.set_label(label),
};
}