Fix inline architecture naming and captured Escape cancellation

2026-09-10 11:10:24 -07:00
parent 1797516f46
commit 7d1df4f369
9 changed files with 722 additions and 21 deletions
@@ -1019,6 +1019,7 @@ impl App {
            iced::time::every(std::time::Duration::from_secs(10)).map(|_| Message::CheckpointTick),
            window::close_requests().map(|id| Message::Request(Pending::Close(id))),
            window::resize_events().map(|(_, size)| Message::WindowResized(size)),
+            architecture_authoring::subscription(self),
            iced::event::listen_with(|event, status, _| {
                let iced::Event::Keyboard(keyboard::Event::KeyPressed {
                    key,
@@ -1076,9 +1077,7 @@ impl App {
        // navigation and close retain raw input until explicit completion/cancel.
        if self.architecture.is_some() {
            if matches!(message, Message::Escape) {
-                self.architecture = None;
-                self.canvas_epoch = self.canvas_epoch.wrapping_add(1);
-                return Task::none();
+                return self.architecture_event(architecture_authoring::Event::Cancel);
            }
            let placing = self.architecture.as_ref().is_some_and(|s| s.saved.placing);
            if !matches!(