AI_Assistant/cad-editor
Watch
1
0
Fork
You've already forked cad-editor
 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat(ui): migrate the last dialogs to modals — fully single-window (Plan B)

Browse source 
Move the unsaved-changes prompt, the Save As browser and the
file-association prompt onto `active_modal` / `modal_content`, reusing
their existing open/close helpers (now just set/clear active_modal). The
daemon `view` no longer dispatches per window — every dialog is an
in-canvas modal, so the app is single-window on native and web alike.

`close_active_modal` handles their ✕: the unsaved prompt cancels the
pending close, the association prompt records that it was answered.

Native + web build; 75 tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan Seven 2026-06-16 23:59:38 +03:00
commit 94b906d95b
3 changed files with 56 additions and 81 deletions
Download patch file Download diff file Expand all files Collapse all files

58
src/app/update.rs
View file

@ -117,6 +117,9 @@ impl OpenCADStudio {
self.ribbon.deactivate_tool_if("KEYBOARD");
}
Some(About) => self.ribbon.deactivate_tool_if("ABOUT"),
// Dismissing these via ✕ is the cancel/decline path.
Some(Unsaved) => self.pending_close = None,
Some(AssocPrompt) => self.mark_assoc_prompted(),
_ => {}
}
self.active_modal = None;
@ -5784,24 +5787,16 @@ impl OpenCADStudio {
}
Message::AssocPromptYes => {
self.mark_assoc_prompted();
let close = if let Some(id) = self.assoc_prompt_window.take() {
window::close(id)
} else {
Task::none()
};
let run = Task::perform(
self.active_modal = None;
Task::perform(
crate::io::file_association::set_default_app(),
Message::AssocResult,
);
Task::batch([close, run])
)
}
Message::AssocPromptNo => {
self.mark_assoc_prompted();
if let Some(id) = self.assoc_prompt_window.take() {
window::close(id)
} else {
Task::none()
}
self.active_modal = None;
Task::none()
}
Message::AssocResult(result) => {
match result {
@ -8534,44 +8529,27 @@ impl OpenCADStudio {
self.save_dialog_filename = format!("{}.{ext}", self.tabs[tab_idx].tab_display_name());
}
self.save_dialog_entries = crate::io::read_dir_entries(&self.save_dialog_folder.clone());
let (id, task) = window::open(window::Settings {
size: iced::Size::new(560.0, 480.0),
resizable: true,
level: window::Level::AlwaysOnTop,
..Default::default()
});
self.save_dialog_window = Some(id);
task.map(|_| Message::Noop)
self.active_modal = Some(super::ModalKind::SaveDialog);
Task::none()
}
fn close_save_dialog_window(&mut self) -> Task<Message> {
if let Some(id) = self.save_dialog_window.take() {
window::close(id)
} else {
Task::none()
if self.active_modal == Some(super::ModalKind::SaveDialog) {
self.active_modal = None;
}
Task::none()
}
fn open_unsaved_dialog_window(&mut self) -> Task<Message> {
if let Some(id) = self.unsaved_dialog_window {
return window::gain_focus(id);
}
let (id, task) = window::open(window::Settings {
size: iced::Size::new(420.0, 155.0),
resizable: false,
level: window::Level::AlwaysOnTop,
..Default::default()
});
self.unsaved_dialog_window = Some(id);
task.map(|_| Message::Noop)
self.active_modal = Some(super::ModalKind::Unsaved);
Task::none()
}
fn close_unsaved_dialog_window(&mut self) -> Task<Message> {
if let Some(id) = self.unsaved_dialog_window.take() {
window::close(id)
} else {
Task::none()
if self.active_modal == Some(super::ModalKind::Unsaved) {
self.active_modal = None;
}
Task::none()
}
pub(super) fn load_textstyle_bufs(&mut self, tab: usize) {