Skip to content

Commit 4e558ab

Browse files
committed
chore: More nesting inside cascade!
I thought this was erroring when I tried it earlier...
1 parent bd79adb commit 4e558ab

File tree

1 file changed

+28
-26
lines changed

1 file changed

+28
-26
lines changed

src/application/keyboard.rs

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -76,14 +76,14 @@ impl ObjectImpl for KeyboardInner {
7676
gtk::Scale::with_range(gtk::Orientation::Horizontal, 0., 100., 1.);
7777
..set_halign(gtk::Align::Fill);
7878
..set_size_request(200, 0);
79+
..connect_value_changed(clone!(@weak keyboard => move |this| {
80+
let value = this.get_value() as i32;
81+
if let Err(err) = keyboard.board().set_brightness(value) {
82+
eprintln!("{}", err);
83+
}
84+
println!("{}", value);
85+
}));
7986
};
80-
brightness_scale.connect_value_changed(clone!(@weak keyboard => move |this| {
81-
let value = this.get_value() as i32;
82-
if let Err(err) = keyboard.board().set_brightness(value) {
83-
eprintln!("{}", err);
84-
}
85-
println!("{}", value);
86-
}));
8787

8888
// XXX add support to ColorButton for changing keyboard
8989
let color_button_bin = cascade! {
@@ -112,25 +112,27 @@ impl ObjectImpl for KeyboardInner {
112112
..add(&stack);
113113
};
114114

115-
let action_group = gio::SimpleActionGroup::new();
116-
action_group.add_action(&cascade! {
117-
gio::SimpleAction::new("load", None);
118-
..connect_activate(clone!(@weak keyboard => move |_, _| {
119-
keyboard.load();
120-
}));
121-
});
122-
action_group.add_action(&cascade! {
123-
gio::SimpleAction::new("save", None);
124-
..connect_activate(clone!(@weak keyboard => move |_, _| {
125-
keyboard.save();
126-
}));
127-
});
128-
action_group.add_action(&cascade! {
129-
gio::SimpleAction::new("reset", None);
130-
..connect_activate(clone!(@weak keyboard => move |_, _| {
131-
keyboard.reset();
132-
}));
133-
});
115+
let action_group = cascade! {
116+
gio::SimpleActionGroup::new();
117+
..add_action(&cascade! {
118+
gio::SimpleAction::new("load", None);
119+
..connect_activate(clone!(@weak keyboard => move |_, _| {
120+
keyboard.load();
121+
}));
122+
});
123+
..add_action(&cascade! {
124+
gio::SimpleAction::new("save", None);
125+
..connect_activate(clone!(@weak keyboard => move |_, _| {
126+
keyboard.save();
127+
}));
128+
});
129+
..add_action(&cascade! {
130+
gio::SimpleAction::new("reset", None);
131+
..connect_activate(clone!(@weak keyboard => move |_, _| {
132+
keyboard.reset();
133+
}));
134+
});
135+
};
134136

135137
self.action_group.set(action_group);
136138
self.color_button_bin.set(color_button_bin);

0 commit comments

Comments
 (0)