mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-21 01:18:43 +00:00
Clears the merge conflict reported for #9841. One conflict hunk, in crates/ui-egui/src/canvas.rs: upstream's Scroll All Windows (#9144) added the scroll_all/glide block next to the flick-pan call the dismissal gates touch. Resolution keeps upstream's block wholesale and applies the menu-dismissal gate to both spots it reaches: the glide choice (a dismissal press is no pan, so it neither arms the glide nor moves the other views) and the flick frame. Everything else auto-merged.