1b-agent/OneCAD-Draft
1
0 Fork 0
forked from 1b-agent/opencadstudio-upstream
Code Pull Requests Activity

feat(ui): unified modal dispatch; migrate 4 dialogs (Plan B)

Browse Source 
Replace the per-dialog open flag with a single `active_modal:
Option<ModalKind>` and one `CloseModal` message. view_main matches it to
render the open dialog as an in-canvas modal.

Migrated off OS windows: About (content-sized), Shortcuts, Plugin
Manager and the Update notice (the latter three keep a bounded size via
a wrapping container, since their lists/scroll need defined bounds).

Native + web build; 75 tests pass.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Hakan SevenandClaude Opus 4.8 committed 2026-06-16 19:07:25 +03:00
1 parent e6213eafbb
commit 6a3663b3f1
3 files changed
+70 -70
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/app/update.rs
+17 -59
View File
@@ -5449,34 +5449,22 @@ impl OpenCADStudio {
// ── Keyboard Shortcuts Panel ──────────────────────────────────────
Message::ShortcutsPanelOpen => {
if let Some(id) = self.shortcuts_window {
return window::gain_focus(id);
}
let (id, task) = window::open(window::Settings {
size: iced::Size::new(720.0, 520.0),
resizable: true,
level: window::Level::AlwaysOnTop,
..Default::default()
});
self.shortcuts_window = Some(id);
task.map(|_| Message::Noop)
self.active_modal = Some(super::ModalKind::Shortcuts);
Task::none()
}
Message::ShortcutsPanelClose => {
if let Some(id) = self.shortcuts_window.take() {
window::close(id)
} else {
Task::none()
}
self.active_modal = None;
Task::none()
}
// ── About window ──────────────────────────────────────────────
Message::AboutOpen => {
self.about_open = true;
self.active_modal = Some(super::ModalKind::About);
Task::none()
}
Message::AboutClose => {
self.about_open = false;
Message::CloseModal => {
self.active_modal = None;
Task::none()
}
@@ -5492,24 +5480,12 @@ impl OpenCADStudio {
// ── Plugin Manager window ─────────────────────────────────────
Message::PluginManagerOpen => {
if let Some(id) = self.plugin_manager_window {
return window::gain_focus(id);
}
let (id, task) = window::open(window::Settings {
size: iced::Size::new(520.0, 460.0),
resizable: true,
level: window::Level::AlwaysOnTop,
..Default::default()
});
self.plugin_manager_window = Some(id);
task.map(|_| Message::Noop)
self.active_modal = Some(super::ModalKind::PluginManager);
Task::none()
}
Message::PluginManagerClose => {
if let Some(id) = self.plugin_manager_window.take() {
window::close(id)
} else {
Task::none()
}
self.active_modal = None;
Task::none()
}
Message::EnterViewport(handle) => {
@@ -5788,35 +5764,17 @@ impl OpenCADStudio {
};
self.update_notice_version = Some(info.version);
self.update_notice_body = Some(info.body);
if let Some(id) = self.update_notice_window {
return window::gain_focus(id);
}
let (id, task) = window::open(window::Settings {
// Sized for the new release-notes panel — wide enough
// for typical GitHub release headlines, tall enough for
// a meaningful scroll preview without dwarfing the app.
size: iced::Size::new(560.0, 460.0),
resizable: true,
level: window::Level::AlwaysOnTop,
..Default::default()
});
self.update_notice_window = Some(id);
task.map(|_| Message::Noop)
self.active_modal = Some(super::ModalKind::UpdateNotice);
Task::none()
}
Message::UpdateNoticeClose => {
if let Some(id) = self.update_notice_window.take() {
window::close(id)
} else {
Task::none()
}
self.active_modal = None;
Task::none()
}
Message::UpdateNoticeOpenRelease => {
crate::sys::open_url(crate::update_check::RELEASES_PAGE);
if let Some(id) = self.update_notice_window.take() {
window::close(id)
} else {
Task::none()
}
self.active_modal = None;
Task::none()
}
Message::AssocPromptYes => {
self.mark_assoc_prompted();