Update libcosmic
This commit is contained in:
parent
ef32539aae
commit
4fcdc77603
3 changed files with 104 additions and 90 deletions
|
|
@ -411,8 +411,9 @@ impl Application for App {
|
|||
Some(&self.nav_model)
|
||||
}
|
||||
|
||||
fn on_app_exit(&mut self) {
|
||||
fn on_app_exit(&mut self) -> Option<Message> {
|
||||
self.result_opt = Some(DialogResult::Cancel);
|
||||
None
|
||||
}
|
||||
|
||||
fn on_nav_select(&mut self, entity: segmented_button::Entity) -> Command<Message> {
|
||||
|
|
@ -791,10 +792,7 @@ impl Application for App {
|
|||
}
|
||||
}
|
||||
|
||||
//TODO: how to properly kill this task?
|
||||
loop {
|
||||
tokio::time::sleep(time::Duration::new(1, 0)).await;
|
||||
}
|
||||
std::future::pending().await
|
||||
},
|
||||
),
|
||||
self.tab.subscription().map(Message::TabMessage),
|
||||
|
|
|
|||
|
|
@ -292,7 +292,6 @@ pub fn scan_path(tab_path: &PathBuf, sizes: IconSizes) -> Vec<Item> {
|
|||
pos_opt: Cell::new(None),
|
||||
rect_opt: Cell::new(None),
|
||||
selected: false,
|
||||
click_time: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -385,7 +384,6 @@ pub fn scan_trash(sizes: IconSizes) -> Vec<Item> {
|
|||
pos_opt: Cell::new(None),
|
||||
rect_opt: Cell::new(None),
|
||||
selected: false,
|
||||
click_time: None,
|
||||
});
|
||||
}
|
||||
}
|
||||
|
|
@ -521,7 +519,6 @@ pub struct Item {
|
|||
pub pos_opt: Cell<Option<(usize, usize)>>,
|
||||
pub rect_opt: Cell<Option<Rectangle>>,
|
||||
pub selected: bool,
|
||||
pub click_time: Option<Instant>,
|
||||
}
|
||||
|
||||
impl Item {
|
||||
|
|
@ -769,7 +766,6 @@ impl Tab {
|
|||
continue;
|
||||
}
|
||||
item.selected = true;
|
||||
item.click_time = None;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
@ -1275,7 +1271,6 @@ impl Tab {
|
|||
} else {
|
||||
item.selected = false;
|
||||
}
|
||||
item.click_time = None;
|
||||
}
|
||||
}
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue