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

Split code into method

Browse source
This commit is contained in:
Ian Douglas Scott 2021-08-30 12:33:45 -07:00
parent d926d449b3
commit 3d85922fcc
1 changed files with 30 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

56
src/status_menu.rs
View file

@ -77,32 +77,8 @@ impl StatusMenu {
let menu = item.menu().unwrap(); // XXX unwrap? let menu = item.menu().unwrap(); // XXX unwrap?
let layout = menu.get_layout(0, -1, &[]).await?.1; let layout = menu.get_layout(0, -1, &[]).await?.1;
menu.connect_layout_updated(clone!(@weak obj => move |_revision, parent| { menu.connect_layout_updated(clone!(@weak obj => move |revision, parent| {
let mut menus = obj.inner().menus.borrow_mut(); obj.layout_updated(revision, parent);
if let Some(Menu { box_, children }) = menus.remove(&parent) {
let mut next_child = box_.first_child();
while let Some(child) = next_child {
next_child = child.next_sibling();
box_.remove(&child);
}
fn remove_child_menus(menus: &mut HashMap<i32, Menu>, children: Vec<i32>) {
for i in children {
if let Some(menu) = menus.remove(&i) {
remove_child_menus(menus, menu.children);
}
}
}
remove_child_menus(&mut menus, children);
glib::MainContext::default().spawn_local(clone!(@weak obj => async move {
match obj.inner().dbus_menu.get_layout(parent, -1, &[]).await {
Ok((_, layout)) => obj.populate_menu(&box_, &layout),
Err(err) => eprintln!("Failed to call 'GetLayout': {}", err),
}
}));
}
})); }));
obj.inner().item.set(item); obj.inner().item.set(item);
@ -118,6 +94,34 @@ impl StatusMenu {
StatusMenuInner::from_instance(self) StatusMenuInner::from_instance(self)
} }
fn layout_updated(&self, _revision: u32, parent: i32) {
let mut menus = self.inner().menus.borrow_mut();
if let Some(Menu { box_, children }) = menus.remove(&parent) {
let mut next_child = box_.first_child();
while let Some(child) = next_child {
next_child = child.next_sibling();
box_.remove(&child);
}
fn remove_child_menus(menus: &mut HashMap<i32, Menu>, children: Vec<i32>) {
for i in children {
if let Some(menu) = menus.remove(&i) {
remove_child_menus(menus, menu.children);
}
}
}
remove_child_menus(&mut menus, children);
glib::MainContext::default().spawn_local(clone!(@weak self as self_ => async move {
match self_.inner().dbus_menu.get_layout(parent, -1, &[]).await {
Ok((_, layout)) => self_.populate_menu(&box_, &layout),
Err(err) => eprintln!("Failed to call 'GetLayout': {}", err),
}
}));
}
}
fn populate_menu(&self, box_: &gtk4::Box, layout: &Layout) { fn populate_menu(&self, box_: &gtk4::Box, layout: &Layout) {
let mut children = Vec::new(); let mut children = Vec::new();