Merge pull request #6203 from dotCooCoo/fix/flyout-panels-follow-up

Panels: tests pin the palette windows staying shown for torn-off strips and new toolbars
This commit is contained in:
BFlat
2026-11-09 02:04:13 +08:00
committed by GitHub
2 changed files with 34 additions and 2 deletions
+2 -1
View File
@@ -1136,7 +1136,8 @@ pub(crate) fn show(app: &mut VectorcraftApp, ui: &mut egui::Ui) {
}
let modal = modal_open(app, &ctx);
// Palette windows are OS windows of their own, held above the app's window while it is active,
// so a dialog, a menu or a tool flyout drawn in the main window would be covered by them.
// so a dialog, a menu, a tool flyout or the All Tools drawer drawn in the main window would be
// covered by them.
#[cfg(not(target_arch = "wasm32"))]
palette_window_levels(&ctx, &layout, modal, egui::Popup::is_any_open(&ctx) || crate::menus::menu_open(&ctx) || crate::toolbar::flyout_open(&ctx));
let mut blocked = Vec::new();
@@ -750,7 +750,38 @@ fn a_flyout_or_drawer_of_a_hidden_toolbar_leaves_the_palette_windows_shown() {
h.app.run("window.panels", json!({})).unwrap();
h.frames(1);
assert!(!h.app.ui.toolbar && h.app.ui.flyout.is_some(), "the flyout is left set with the Tools panel hidden");
assert_eq!(take_palette_commands(&h, viewport).0.last(), Some(&true), "shown again: the flyout does not draw");
assert_eq!(take_palette_commands(&h, viewport).0, [true], "shown again: the flyout does not draw");
}
/// A strip torn off a flyout and a toolbar made with New Toolbar stay on screen like panels, so the
/// palette windows stay shown beside them.
#[test]
fn a_torn_off_strip_or_a_new_toolbar_leaves_the_palette_windows_shown() {
let mut h = Harness::new();
let viewport = h.float("navigator");
h.host.borrow_mut().focus = ViewportId::ROOT;
h.frames(2);
take_palette_commands(&h, viewport);
// The commands go only on a change, so the drawer opening and closing shows the palette windows
// were on screen before the strip and the toolbar.
h.app.run("window.editToolbar", json!({"open": true})).unwrap();
h.frames(2);
assert_eq!(take_palette_commands(&h, viewport).0, [false], "hidden under the drawer");
h.app.run("window.editToolbar", json!({"open": false})).unwrap();
h.frames(2);
assert_eq!(take_palette_commands(&h, viewport).0, [true], "shown when the drawer closes");
h.app.run("window.floatTools", json!({"tool": "pen"})).unwrap();
h.app.run("window.toolbar.new", json!({"name": "Mine"})).unwrap();
h.frames(2);
let strips: Vec<&str> = h.app.ui.floating_flyouts.iter().filter_map(|strip| strip.tools.first().map(String::as_str)).collect();
assert_eq!(strips, ["pen"], "the Pen strip floats");
let toolbars: Vec<(&str, bool)> = h.app.ui.custom_toolbars.iter().map(|toolbar| (toolbar.name.as_str(), toolbar.shown)).collect();
assert_eq!(toolbars, [("Mine", true)], "the new toolbar shows");
assert_eq!(h.app.ui.flyout, None, "no flyout is open");
assert_eq!(take_palette_commands(&h, viewport), (vec![], vec![]), "the palette windows are left as they were");
h.app.run("window.editToolbar", json!({"open": true})).unwrap();
h.frames(2);
assert_eq!(take_palette_commands(&h, viewport).0, [false], "still shown: the drawer hides them again");
}
/// The frame in which a click elsewhere closes a flyout or the drawer shows the palette windows, as