mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 09:26:43 +00:00
Conflicts and how they were resolved: - crates/ui-egui/src/canvas.rs (ensure_filter_preview): kept our edit_command(), which also covers the Blending Options dialog and checks the target guard; main's smart_ui::confirm_command(fields, cmd, params) form (#6324) is the same preview (setParams on the proxy) without the guard. - crates/ui-egui/src/filter_dialog.rs (preview_document_for_target): kept our scaling of the smart filters' lengths and the mask feather on the proxy (proxy_document already scales cache, placement and mask, so nothing is scaled twice); dropped main's run-at-full-size branch for setParams and its now unused SMART_FILTER_SET_PARAMS constant. - crates/ui-egui/src/smart_ui.rs (open_editor): kept our open_editor (target guard, adjust_dialog then filter_dialog with reset_fields, then __smartFilter and the stored params) over main's edit_filter helper; adjustment edits keep their live preview (adjust_preview skips the layer path for __smartFilter), so main's __preview removal for __adjust is not needed. Adapted to main's API: smart_ui::preview_command (main, #6324) now also returns the Blending Options command for our blending dialog, so the preview window matches its key. Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>