Crop: a ui.pointer click on the frame leaves it alone (#7740) (#7741)

`to_press` and `control_point` read a point in the press-time view through
`remap`, which rounds it through f32 and the view even when the view hasn't
moved. A `ui.pointer` down + up at the same point then came back slightly
apart: the frame moved by a hair and a box Undo step was pushed that undid
nothing visible. Skip the remap while the view is still the press view.

Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
David MannandClaude Opus 5.5 authored and GitHub committed 2026-10-19 14:19:15 -04:00
1 parent 98d3ebc1f5
commit 2cc107d05f
1 file changed
+28 -3
+28 -3
View File
@@ -212,10 +212,11 @@ fn remap(p: [f64; 2], from: PressView, to: PressView, flip: bool) -> [f64; 2] {
}
/// A pointer point `p` the canvas mapped through the view as it is now, read in the press-time
/// view `press` (unchanged without one).
/// view `press` (unchanged without one, or while the view hasn't moved: the `f32` round trip
/// would nudge a click).
pub fn to_press(app: &PhotocraftApp, press: Option<PressView>, p: [f64; 2]) -> [f64; 2] {
match (press, press_view(app)) {
(Some(press), Some(now)) => remap(p, now, press, app.ui.view.flip_horizontal),
(Some(press), Some(now)) if press != now => remap(p, now, press, app.ui.view.flip_horizontal),
_ => p,
}
}
@@ -239,7 +240,7 @@ pub fn control_point(app: &PhotocraftApp, p: [f64; 2]) -> [f64; 2] {
_ => None,
};
match (press, press_view(app)) {
(Some(press), Some(now)) if app.ui.tool == Tool::Crop => remap(p, press, now, app.ui.view.flip_horizontal),
(Some(press), Some(now)) if app.ui.tool == Tool::Crop && press != now => remap(p, press, now, app.ui.view.flip_horizontal),
_ => p,
}
}
@@ -452,6 +453,30 @@ mod tests {
assert!(((c1[0] - c0[0]).hypot(c1[1] - c0[1]) - 30.0).abs() < 1e-3);
}
/// A `ui.pointer` click (down and up at the same point, no move) changes nothing, upright or
/// turned: reading the point in the press view used to round it through `f32` and the view,
/// nudging the frame by a hair and pushing a box Undo step that undid nothing visible.
#[test]
fn a_ui_pointer_click_changes_nothing() {
let ctx = egui::Context::default();
for deg in [0.0, -30.0, 41.5] {
let mut app = app();
with_frame(&mut app);
app.ui.crop_angle = deg;
sync_frame(&mut app);
let (rect, angle) = (app.ui.crop_rect, app.ui.crop_angle);
// Inside the frame (moves the image) and outside it (turns the image).
for p in [[70.3, 50.7], [55.17, 41.9], [83.01, 59.33], [150.3, 50.7], [10.9, 90.1]] {
let ev = json!([{"kind": "down", "x": p[0], "y": p[1]}, {"kind": "up", "x": p[0], "y": p[1]}]);
let (req, _rx) = crate::control::ControlRequest::new("ui.pointer", json!({"events": ev}));
let crate::control::Outcome::Done(v) = crate::control::handle(&mut app, &ctx, &req) else { panic!("ui.pointer didn't finish") };
assert_eq!(v["ok"], true, "{v}");
assert_eq!((app.ui.crop_rect, app.ui.crop_angle), (rect, angle), "click at {p:?}, frame at {deg}°");
assert_eq!(crate::crop_ui::is_enabled(&app, "edit.undo"), None, "click at {p:?}, frame at {deg}°: a box Undo step");
}
}
}
#[test]
fn the_readout_is_the_images_turn_clockwise_positive() {
let mut app = app();