LightCraft: An open-source non-destructive photo editor written by scratch in pure Rust
Docking: repin craft-libs 1774443; a dragged divider keeps its panel's width without app code
aiongga70d7638a07f
diff --git a/Cargo.lock b/Cargo.lockindex 5d17222c1..a15fe2744 100644--- a/Cargo.lock+++ b/Cargo.lock@@ -1084,12 +1084,12 @@ dependencies = [[[package]]name = "craft-docpath"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=16fb3d46e1eaa0d455465e4e66a3ac7b17b55bd3#16fb3d46e1eaa0d455465e4e66a3ac7b17b55bd3"+source = "git+https://github.com/storytold/craft-libs?rev=17744430be327d0257496a6a31c8d38fe20a6756#17744430be327d0257496a6a31c8d38fe20a6756"[[package]]name = "craft-ui"version = "0.1.0"-source = "git+https://github.com/storytold/craft-libs?rev=16fb3d46e1eaa0d455465e4e66a3ac7b17b55bd3#16fb3d46e1eaa0d455465e4e66a3ac7b17b55bd3"+source = "git+https://github.com/storytold/craft-libs?rev=17744430be327d0257496a6a31c8d38fe20a6756#17744430be327d0257496a6a31c8d38fe20a6756"dependencies = ["egui","log",diff --git a/Cargo.toml b/Cargo.tomlindex 3564f8491..20118c218 100644--- a/Cargo.toml+++ b/Cargo.toml@@ -10,8 +10,8 @@ rust-version = "1.95"repository = "https://github.com/storytold/lightcraft"[workspace.dependencies]-craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "16fb3d46e1eaa0d455465e4e66a3ac7b17b55bd3", features = ["serde"] }-craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "16fb3d46e1eaa0d455465e4e66a3ac7b17b55bd3" }+craft-ui = { git = "https://github.com/storytold/craft-libs", rev = "17744430be327d0257496a6a31c8d38fe20a6756", features = ["serde"] }+craft-docpath = { version = "0.1.0", git = "https://github.com/storytold/craft-libs", rev = "17744430be327d0257496a6a31c8d38fe20a6756" }# internallightcraft-denoise-core = { path = "crates/denoise-core" }lightcraft-denoise = { path = "crates/denoise", default-features = false }diff --git a/crates/ui-egui/src/docking.rs b/crates/ui-egui/src/docking.rsindex 52914dd91..4128b1628 100644--- a/crates/ui-egui/src/docking.rs+++ b/crates/ui-egui/src/docking.rs@@ -314,7 +314,6 @@ pub fn show(app: &mut crate::LightcraftApp, ui: &mut egui::Ui) {style.font = t.font(12.0);// Tool and preset panels publish hover previews before the photo consumes them.let mut canvas = None;- let (mut library_width, mut tools_width) = (None, None);let output = DockArea::new(egui::Id::new("lightcraft-docking")).locked(workspace.locked).show_with_limits(ui,&workspace.layout,@@ -327,12 +326,10 @@ pub fn show(app: &mut crate::LightcraftApp, ui: &mut egui::Ui) {canvas = Some(ui.new_child(egui::UiBuilder::new().id_salt("photo-view").max_rect(ui.max_rect())));}Panel::Library => {- library_width = Some(ui.max_rect().width());crate::widgets::register(ui.ctx(), "panel:left_panel", ui.max_rect());crate::panels::left::show(app, ui);}Panel::Tools => {- tools_width = Some(ui.max_rect().width());crate::widgets::register(ui.ctx(), "panel:right_panel", ui.max_rect());crate::panels::right::show(app, ui);}@@ -367,8 +364,6 @@ pub fn show(app: &mut crate::LightcraftApp, ui: &mut egui::Ui) {let stale = workspace.layout != rendered.layout || workspace.hidden != rendered.hidden;if stale {craft_ui::docking::cancel_drag::<Panel>(ui.ctx(), egui::Id::new("lightcraft-docking"));- } else {- keep_side_widths(&mut workspace, [(Panel::Library, library_width), (Panel::Tools, tools_width)]);}publish_visibility(app, &workspace);app.ui.docking = Some(workspace);@@ -385,45 +380,6 @@ pub fn show(app: &mut crate::LightcraftApp, ui: &mut egui::Ui) {}}-/// A dragged divider stores a ratio. The side panels keep the width they were drawn at instead,-/// so a window resize leaves them as they are and `left_width` / `right_width` follow them.-fn keep_side_widths(workspace: &mut Workspace, drawn: [(Panel, Option<f32>); 2]) {- let mut nodes = workspace.layout.root.as_ref().map(|node| vec![(node, Vec::new())]).unwrap_or_default();- let mut changes = Vec::new();- while let Some((node, path)) = nodes.pop() {- let Node::Split { axis, size, first, second } = node else { continue };- if *axis == SplitAxis::Horizontal && matches!(size, SplitSize::Ratio(_)) {- let fixed = drawn.iter().find_map(|(panel, width)| {- // A width drawn from a ratio carries float noise; in hundredths a panel at its- // limit stores the limit itself.- let width = width.filter(|width| width.is_finite() && *width > 0.0).map(|width| (width * 100.0).round() / 100.0)?;- if holds(first, *panel) { Some(SplitSize::FixedFirst(width)) } else { holds(second, *panel).then_some(SplitSize::FixedSecond(width)) }- });- if let Some(size) = fixed {- changes.push(Action::ResizeSplit { path: path.clone(), size });- }- }- for (child, side) in [(second, true), (first, false)] {- let mut path = path.clone();- path.push(side);- nodes.push((child, path));- }- }- for action in changes {- // A size the layout refuses leaves the ratio, which still draws the same widths.- let _ = apply(workspace, action);- }-}--/// Whether `node` is the group (tabs or accordion) holding `panel`.-fn holds(node: &Node<Panel>, panel: Panel) -> bool {- match node {- Node::Tabs { panels, .. } => panels.contains(&panel),- Node::Stack { entries } => entries.iter().any(|entry| entry.panel == panel),- _ => false,- }-}-/// Keep the established ui.set width controls connected to the panel's current parent split.pub(crate) fn set_widths(state: &mut crate::UiState, params: &Value) -> Result<(), String> {state.left_width = crate::state::LEFT_WIDTH.clamp(state.left_width);@@ -457,7 +413,11 @@ pub(crate) fn set_widths(state: &mut crate::UiState, params: &Value) -> Result<(let mut change = None;while let Some((node, path)) = nodes.pop() {if let Node::Split { axis, first, second, .. } = node {- let contains = |node: &Node<Panel>| holds(node, panel);+ let contains = |node: &Node<Panel>| match node {+ Node::Tabs { panels, .. } => panels.contains(&panel),+ Node::Stack { entries } => entries.iter().any(|entry| entry.panel == panel),+ _ => false,+ };if *axis == SplitAxis::Horizontal {if contains(first) {change = Some(Action::ResizeSplit { path: path.clone(), size: SplitSize::FixedFirst(width) });