Skip to content

LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust

Docking: a drop at the window's edge makes no dock column

aionggee1576682abc
diff --git a/crates/ui-egui/src/docking.rs b/crates/ui-egui/src/docking.rs
index 4128b1628..636081967 100644
--- a/crates/ui-egui/src/docking.rs
+++ b/crates/ui-egui/src/docking.rs
@@ -298,6 +298,8 @@ pub fn show(app: &mut crate::LightcraftApp, ui: &mut egui::Ui) {
app.ui.docking = Some(workspace.clone());
let mut style = DockStyle::from_ui(ui);
style.min_pane = 96.0;
+ // The side panels are frames whose widths LightCraft tracks; dock columns are not offered.
+ style.new_dock_zones = false;
style.float_label = crate::i18n::tr("Float panel").into();
style.close_label = crate::i18n::tr("Close panel").into();
style.move_panel_to_label = crate::i18n::tr("Move to group").into();
diff --git a/crates/ui-egui/tests/it/docking_workflows.rs b/crates/ui-egui/tests/it/docking_workflows.rs
index 7538946b1..a8e6c3d51 100644
--- a/crates/ui-egui/tests/it/docking_workflows.rs
+++ b/crates/ui-egui/tests/it/docking_workflows.rs
@@ -116,6 +116,29 @@ fn dragging_a_group_by_its_bar_moves_the_whole_group() {
assert_eq!(h.state().ui.right, RightPanel::Edit);
}
+/// LightCraft's side panels live in frames; a drop at the window's edge makes no dock column.
+#[test]
+fn an_edge_drop_does_not_create_a_dock() {
+ for at_right in [false, true] {
+ let mut h = harness(None, 1400.0, 1.0);
+ let library = h.state().widgets.iter().find(|(id, _)| id == "panel:left_panel").unwrap().1;
+ let tools = h.state().widgets.iter().find(|(id, _)| id == "panel:right_panel").unwrap().1;
+ let x = if at_right { tools.right() - 4.0 } else { library.left() + 4.0 };
+ let source = h.get_by_role_and_label(egui::accesskit::Role::Tab, "Tools").rect().center();
+ drag(&mut h, source, egui::pos2(x, 500.0));
+ let layout = &h.state().ui.docking.as_ref().unwrap().layout;
+ assert!(layout.contains(&Panel::Tools));
+ let mut nodes: Vec<_> = layout.root.iter().collect();
+ while let Some(node) = nodes.pop() {
+ match node {
+ Node::Split { first, second, .. } => nodes.extend([&**first, &**second]),
+ Node::Dock { .. } => panic!("a drop at x = {x} made a dock: {layout:?}"),
+ _ => {}
+ }
+ }
+ }
+}
+
#[test]
fn invalid_docking_requests_preserve_layout_and_selected_tool() {
let mut h = harness(None, 1400.0, 1.0);