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

fix(tray): menus not attaching to secondary bars

Browse source
This commit is contained in:
Jake Stanger 2024-11-17 14:47:42 +00:00
parent 48dc65f60b
commit 5aa9f37fe4
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
2 changed files with 11 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

13
src/modules/tray/interface.rs
View file

@ -7,7 +7,7 @@ use system_tray::item::{IconPixmap, StatusNotifierItem, Tooltip};
/// Main tray icon to show on the bar /// Main tray icon to show on the bar
pub(crate) struct TrayMenu { pub(crate) struct TrayMenu {
pub event_box: EventBox, pub event_box: EventBox,
pub widget: MenuItem, widget: MenuItem,
image_widget: Option<Image>, image_widget: Option<Image>,
label_widget: Option<Label>, label_widget: Option<Label>,
@ -18,7 +18,7 @@ pub(crate) struct TrayMenu {
} }
impl TrayMenu { impl TrayMenu {
pub fn new(item: StatusNotifierItem) -> Self { pub fn new(address: &str, item: StatusNotifierItem) -> Self {
let event_box = EventBox::new(); let event_box = EventBox::new();
let widget = MenuItem::new(); let widget = MenuItem::new();
@ -27,7 +27,7 @@ impl TrayMenu {
event_box.show_all(); event_box.show_all();
Self { let mut slf = Self {
event_box, event_box,
widget, widget,
image_widget: None, image_widget: None,
@ -36,7 +36,14 @@ impl TrayMenu {
icon_name: item.icon_name, icon_name: item.icon_name,
icon_theme_path: item.icon_theme_path, icon_theme_path: item.icon_theme_path,
icon_pixmap: item.icon_pixmap, icon_pixmap: item.icon_pixmap,
};
if let Some(menu) = item.menu {
let menu = system_tray::gtk_menu::Menu::new(address, &menu);
slf.set_menu_widget(menu);
} }
slf
} }
/// Updates the label text, and shows it in favour of the image. /// Updates the label text, and shows it in favour of the image.

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

@ -150,7 +150,7 @@ fn on_update(
Event::Add(address, item) => { Event::Add(address, item) => {
debug!("Received new tray item at '{address}': {item:?}"); debug!("Received new tray item at '{address}': {item:?}");
let mut menu_item = TrayMenu::new(*item); let mut menu_item = TrayMenu::new(&address, *item);
container.pack_start(&menu_item.event_box, true, true, 0); container.pack_start(&menu_item.event_box, true, true, 0);
if let Ok(image) = icon::get_image(&menu_item, icon_theme, icon_size, prefer_icons) { if let Ok(image) = icon::get_image(&menu_item, icon_theme, icon_size, prefer_icons) {