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

Prompt to save unsaved changes for unfocussed tabs

Browse source
This commit is contained in:
Josh Megnauth 2024-02-25 23:10:33 -05:00 • committed by Jeremy Soller
parent c259f8368c
commit 95423d6375
1 changed files with 17 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

29
src/main.rs
View file

@ -374,7 +374,7 @@ pub enum ContextPage {
GitManagement, GitManagement,
//TODO: Move search to pop-up //TODO: Move search to pop-up
ProjectSearch, ProjectSearch,
PromptSaveChanges, PromptSaveChanges(segmented_button::Entity),
Settings, Settings,
} }
@ -384,7 +384,7 @@ impl ContextPage {
Self::DocumentStatistics => fl!("document-statistics"), Self::DocumentStatistics => fl!("document-statistics"),
Self::GitManagement => fl!("git-management"), Self::GitManagement => fl!("git-management"),
Self::ProjectSearch => fl!("project-search"), Self::ProjectSearch => fl!("project-search"),
Self::PromptSaveChanges => fl!("prompt-save-changes-title"), Self::PromptSaveChanges(_) => fl!("prompt-save-changes-title"),
Self::Settings => fl!("settings"), Self::Settings => fl!("settings"),
} }
} }
@ -1012,7 +1012,7 @@ impl App {
.into() .into()
} }
fn prompt_save_changes(&self) -> Element<Message> { fn prompt_save_changes(&self, entity: segmented_button::Entity) -> Element<Message> {
let (spacing, warning_color) = { let (spacing, warning_color) = {
let theme = self.core().system_theme().cosmic(); let theme = self.core().system_theme().cosmic();
(theme.spacing, theme.warning_text_color()) (theme.spacing, theme.warning_text_color())
@ -1027,7 +1027,7 @@ impl App {
// Save As is shown if the file has been saved previously // Save As is shown if the file has been saved previously
// Rationale: The user may want to save the modified buffer as a new file // Rationale: The user may want to save the modified buffer as a new file
let save_as_button = match self.active_tab() { let save_as_button = match self.tab_model.data(entity) {
Some(Tab::Editor(tab)) if tab.path_opt.is_some() => { Some(Tab::Editor(tab)) if tab.path_opt.is_some() => {
let save_as = widget::text(fl!("save-as")); let save_as = widget::text(fl!("save-as"));
let save_as_button = widget::button(save_as) let save_as_button = widget::button(save_as)
@ -1914,7 +1914,7 @@ impl Application for App {
self.tab_model.text_set(entity, title); self.tab_model.text_set(entity, title);
} }
// Close save changes prompt only if the dialog succeeded // Close save changes prompt only if the dialog succeeded
if self.context_page == ContextPage::PromptSaveChanges { if let ContextPage::PromptSaveChanges(_) = self.context_page {
self.core_mut().window.show_context = false; self.core_mut().window.show_context = false;
} }
} }
@ -1985,13 +1985,18 @@ impl Application for App {
// Only match a changed editor tab... // Only match a changed editor tab...
Some(Tab::Editor(tab)) if tab.changed() => { Some(Tab::Editor(tab)) if tab.changed() => {
// Don't close the save prompt if `TabClose` is emitted again; only // Don't close the save prompt if `TabClose` is emitted again; only
// toggle if no pages or a different page is open // toggle if no pages are open or a different page is open
if self.context_page != ContextPage::PromptSaveChanges if !self.core.window.show_context
|| !self.core.window.show_context || matches!(self.context_page, ContextPage::PromptSaveChanges(_))
{ {
return self.update(Message::ToggleContextPage( // Focus the tab in case the user is closing an unfocussed tab
ContextPage::PromptSaveChanges, // Otherwise, closing an unfocussed tab would be very confusing
)); return Command::batch([
self.update(Message::TabActivate(entity)),
self.update(Message::ToggleContextPage(
ContextPage::PromptSaveChanges(entity),
)),
]);
} }
} }
// ...or else just close it // ...or else just close it
@ -2195,7 +2200,7 @@ impl Application for App {
ContextPage::DocumentStatistics => self.document_statistics(), ContextPage::DocumentStatistics => self.document_statistics(),
ContextPage::GitManagement => self.git_management(), ContextPage::GitManagement => self.git_management(),
ContextPage::ProjectSearch => self.project_search(), ContextPage::ProjectSearch => self.project_search(),
ContextPage::PromptSaveChanges => self.prompt_save_changes(), ContextPage::PromptSaveChanges(entity) => self.prompt_save_changes(entity),
ContextPage::Settings => self.settings(), ContextPage::Settings => self.settings(),
}) })
} }