Files
photocraft/contributors
Kaedo17 6a5b9efdc1 Merge upstream/main into fix/zoom-tool-context-menu
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.
2026-11-09 08:02:25 +08:00
..