DesignCraft: An open-source page and layout design editor written by scratch in pure Rust
Integration: #1022 style panels closed from the dock reopen in the dock, not floating
aionggbe8c85705ccb
diff --git a/crates/ui-egui/src/panel_docking.rs b/crates/ui-egui/src/panel_docking.rsindex 32bcda7be..6f5d87c47 100644--- a/crates/ui-egui/src/panel_docking.rs+++ b/crates/ui-egui/src/panel_docking.rs@@ -310,6 +310,10 @@ fn open_floating_group(app: &mut DesignApp, params: &Value) -> Option<Result<Valif app.ui.icon_groups.as_ref().is_some_and(|g| g.iter().flatten().any(|p| group.contains(&p.as_str()))) {return None;}+ // A panel closed from a place in the dock comes back there.+ if group.iter().any(|p| app.ui.docking_hidden.get(*p).is_some_and(|l| l.floating.is_none())) {+ return None;+ }let layout = app.ui.docking.clone().unwrap_or_else(|| legacy(app));if group.iter().any(|p| layout.contains(&p.to_string())) {return None;diff --git a/crates/ui-egui/src/panel_docking_tests.rs b/crates/ui-egui/src/panel_docking_tests.rsindex f55918304..1ffb17ebb 100644--- a/crates/ui-egui/src/panel_docking_tests.rs+++ b/crates/ui-egui/src/panel_docking_tests.rs@@ -729,3 +729,20 @@ fn paragraph_styles_open_floating_with_character_styles() {assert_eq!(group.panels[group.active], "characterStyles");assert_eq!(layout.panels().iter().filter(|p| p.as_str() == "characterStyles").count(), 1);}++/// Style panels the user docked and then closed come back in the dock, not floating.+#[test]+fn paragraph_styles_closed_from_the_dock_reopen_there() {+ let mut app = app();+ app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();+ for panel in ["characterStyles", "paragraphStyles"] {+ app.run("window.panel.move", json!({"panel": panel, "anchor": "properties"})).unwrap();+ }+ for panel in ["characterStyles", "paragraphStyles"] {+ app.run("window.panel.close", json!({"panel": panel})).unwrap();+ }+ app.run("window.panel", json!({"panel":"paragraphStyles"})).unwrap();+ let layout = app.ui.docking.clone().unwrap();+ assert!(layout.contains(&"paragraphStyles".to_string()));+ assert!(layout.floating.iter().all(|g| !g.panels.iter().any(|p| p == "paragraphStyles")), "{:?}", layout.floating);+}