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

refactor: recv_glib dependency arrays

Browse source 
Adds a dependency array system to `recv_glib` which internally clones the passed deps and then passes by reference to the callback.

This cleans up a lot of the big `{}` blocks full of `widget.clone()` and removes a lot of boilerplate. Yay!
This commit is contained in:
Jake Stanger 2025-05-26 22:17:26 +01:00
parent beab26a37e
commit 9d18ce52f5
No known key found for this signature in database
GPG key ID: C51FC8F9CB0BEA61
31 changed files with 539 additions and 517 deletions
Download patch file Download diff file Expand all files Collapse all files

25
src/modules/volume.rs
View file

@ -228,13 +228,11 @@ impl Module<Button> for VolumeModule {
});
}
{
let rx = context.subscribe();
let icons = self.icons.clone();
let rx = context.subscribe();
let format = self.format.clone();
rx.recv_glib(move |event| match event {
rx.recv_glib(
(&self.icons, &self.format),
move |(icons, format), event| match event {
Event::AddSink(sink) | Event::UpdateSink(sink) if sink.active => {
let label = format
.replace(
@ -251,8 +249,8 @@ impl Module<Button> for VolumeModule {
button_label.set_label_escaped(&label);
}
_ => {}
});
}
},
);
let popup = self
.into_popup(context, info)
@ -351,13 +349,11 @@ impl Module<Button> for VolumeModule {
container.show_all();
let mut inputs = HashMap::new();
let mut sinks = vec![];
{
let input_container = input_container.clone();
let mut sinks = vec![];
context.subscribe().recv_glib(move |event| {
context
.subscribe()
.recv_glib(&input_container, move |input_container, event| {
match event {
Event::AddSink(info) => {
sink_selector.append(Some(&info.name), &info.description);
@ -477,7 +473,6 @@ impl Module<Button> for VolumeModule {
}
}
});
}
Some(container)
}