leyoda/cosmic-files
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge pull request #679 from joshuamegnauth54/unset-show-details-on-close

Browse source 
Unset `show_details` on close too
This commit is contained in:
Jeremy Soller 2024-12-18 09:18:44 -07:00 • committed by GitHub
commit 626ceb4968
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

15
src/app.rs
View file

@ -2587,11 +2587,9 @@ impl Application for App {
match self.mode { match self.mode {
Mode::App => { Mode::App => {
let show_details = !self.config.show_details; let show_details = !self.config.show_details;
//TODO: move to update_config?
self.context_page = ContextPage::Preview(None, PreviewKind::Selected); self.context_page = ContextPage::Preview(None, PreviewKind::Selected);
self.core.window.show_context = show_details; self.core.window.show_context = show_details;
config_set!(show_details, show_details); return cosmic::task::message(Message::SetShowDetails(show_details));
return self.update_config();
} }
Mode::Desktop => { Mode::Desktop => {
let selected_paths = self.selected_paths(entity_opt); let selected_paths = self.selected_paths(entity_opt);
@ -2965,6 +2963,12 @@ impl Application for App {
self.set_show_context(true); self.set_show_context(true);
} }
self.context_page = context_page; self.context_page = context_page;
// Preview status is preserved across restarts
if matches!(self.context_page, ContextPage::Preview(_, _)) {
return cosmic::task::message(app::Message::App(Message::SetShowDetails(
self.core.window.show_context,
)));
}
} }
Message::Undo(_id) => { Message::Undo(_id) => {
// TODO: undo // TODO: undo
@ -3495,10 +3499,7 @@ impl Application for App {
}; };
context_drawer::context_drawer( context_drawer::context_drawer(
self.preview(entity_opt, kind, true), self.preview(entity_opt, kind, true),
Message::ToggleContextPage(ContextPage::Preview( Message::ToggleContextPage(ContextPage::Preview(*entity_opt, kind.clone())),
entity_opt.clone(),
kind.clone(),
)),
) )
.header_actions(actions) .header_actions(actions)
} }