Skip to content

Commit 4176fea

Browse files
ids1024jackpot51
authored andcommitted
improv: Use glib::clone! macro in picker
1 parent 3c0ca08 commit 4176fea

File tree

1 file changed

+4
-3
lines changed

1 file changed

+4
-3
lines changed

src/application/picker/mod.rs

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
use super::keyboard::Keyboard;
22
use cascade::cascade;
3+
use glib::clone;
34
use glib::subclass;
45
use glib::subclass::prelude::*;
56
use gtk::prelude::*;
@@ -157,12 +158,12 @@ impl Picker {
157158
}
158159

159160
fn connect_signals(&self) {
161+
let picker = self;
160162
for group in self.inner().groups.iter() {
161163
for key in group.iter_keys() {
162164
let button = &key.gtk;
163-
let picker = self.clone();
164165
let name = key.name.to_string();
165-
button.connect_clicked(move |_| {
166+
button.connect_clicked(clone!(@weak picker => @default-panic, move |_| {
166167
let kb = match picker.inner().keyboard.borrow().clone() {
167168
Some(kb) => kb,
168169
None => {
@@ -203,7 +204,7 @@ impl Picker {
203204
}
204205
}
205206
}
206-
});
207+
}));
207208
}
208209
}
209210
}

0 commit comments

Comments
 (0)