mirror of
https://github.com/johrpan/musicus.git
synced 2025-10-26 19:57:25 +01:00
Update dependencies, use new clone syntax
This commit is contained in:
parent
c70abf9594
commit
36b2f1097e
12 changed files with 603 additions and 490 deletions
|
|
@ -28,24 +28,37 @@ mod imp {
|
|||
self.parent_constructed();
|
||||
|
||||
let obj = self.obj();
|
||||
obj.connect_parent_notify(clone!(@weak obj => move |_: &super::MusicusActivatableRow| {
|
||||
let previous_parent = obj.imp().previous_parent.borrow_mut().take();
|
||||
let previous_signal_handler_id = obj.imp().previous_signal_handler_id.borrow_mut().take();
|
||||
if let (Some(previous_parent), Some(previous_signal_handler_id)) = (previous_parent, previous_signal_handler_id) {
|
||||
previous_parent.disconnect(previous_signal_handler_id);
|
||||
}
|
||||
obj.connect_parent_notify(clone!(
|
||||
#[weak]
|
||||
obj,
|
||||
move |_: &super::MusicusActivatableRow| {
|
||||
let previous_parent = obj.imp().previous_parent.borrow_mut().take();
|
||||
let previous_signal_handler_id =
|
||||
obj.imp().previous_signal_handler_id.borrow_mut().take();
|
||||
if let (Some(previous_parent), Some(previous_signal_handler_id)) =
|
||||
(previous_parent, previous_signal_handler_id)
|
||||
{
|
||||
previous_parent.disconnect(previous_signal_handler_id);
|
||||
}
|
||||
|
||||
if let Some(parent) = obj.parent().and_downcast::<gtk::ListBox>() {
|
||||
let signal_handler_id = parent.connect_row_activated(clone!(@weak obj => move |_: >k::ListBox, row: >k::ListBoxRow| {
|
||||
if *row == obj {
|
||||
obj.activate();
|
||||
}
|
||||
}));
|
||||
if let Some(parent) = obj.parent().and_downcast::<gtk::ListBox>() {
|
||||
let signal_handler_id = parent.connect_row_activated(clone!(
|
||||
#[weak]
|
||||
obj,
|
||||
move |_: >k::ListBox, row: >k::ListBoxRow| {
|
||||
if *row == obj {
|
||||
obj.activate();
|
||||
}
|
||||
}
|
||||
));
|
||||
|
||||
obj.imp().previous_parent.replace(Some(parent));
|
||||
obj.imp().previous_signal_handler_id.replace(Some(signal_handler_id));
|
||||
obj.imp().previous_parent.replace(Some(parent));
|
||||
obj.imp()
|
||||
.previous_signal_handler_id
|
||||
.replace(Some(signal_handler_id));
|
||||
}
|
||||
}
|
||||
}));
|
||||
));
|
||||
}
|
||||
|
||||
fn signals() -> &'static [Signal] {
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue