Preserve layer snapping when releasing drag gestures
Beffroi/beffroi-tools/pipeline/head This commit looks good
Details
Beffroi/beffroi-tools/pipeline/head This commit looks good
Details
This commit is contained in:
parent
1f083f99a7
commit
ad7c48f49b
|
|
@ -1923,6 +1923,10 @@ impl Editor {
|
|||
}
|
||||
}
|
||||
self.snap_guides = [None; 2];
|
||||
let mut snapping = self.snapping;
|
||||
if ui.input(|i| i.modifiers.alt) {
|
||||
snapping.enabled = false;
|
||||
}
|
||||
if response.dragged() {
|
||||
if self.panning {
|
||||
self.pan += response.drag_delta() / scale;
|
||||
|
|
@ -1934,10 +1938,6 @@ impl Editor {
|
|||
m.end = point;
|
||||
self.layout.select_region(m.start, point, &m.base);
|
||||
} else {
|
||||
let mut snapping = self.snapping;
|
||||
if ui.input(|i| i.modifiers.alt) {
|
||||
snapping.enabled = false;
|
||||
}
|
||||
self.snap_guides =
|
||||
self.layout
|
||||
.drag_to_snapped(point, snapping, 6.0 / scale as f64);
|
||||
|
|
@ -1955,7 +1955,8 @@ impl Editor {
|
|||
m.end = point;
|
||||
self.layout.select_region(m.start, point, &m.base);
|
||||
} else {
|
||||
self.layout.drag_to(point);
|
||||
self.layout
|
||||
.drag_to_snapped(point, snapping, 6.0 / scale as f64);
|
||||
}
|
||||
self.sync();
|
||||
}
|
||||
|
|
@ -3852,6 +3853,65 @@ mod tests {
|
|||
assert_eq!(*app.layout.layers(), before);
|
||||
}
|
||||
#[test]
|
||||
fn snapped_move_and_resize_stay_snapped_on_release_and_undo_as_one_edit() {
|
||||
for resize in [false, true] {
|
||||
for zoom in [0.75, 1.0] {
|
||||
let ctx = egui::Context::default();
|
||||
let mut app = Editor {
|
||||
zoom,
|
||||
keep_aspect_ratio: false,
|
||||
..Default::default()
|
||||
};
|
||||
app.snapping.enabled = true;
|
||||
app.snapping.pixels = false;
|
||||
app.snapping.layer_edges = false;
|
||||
let before = app.layout.layers().clone();
|
||||
let output = frame(&mut app, &ctx, vec![]);
|
||||
let rect = layer_rects(&output)[1];
|
||||
let scale = rect.width() / before[1].width as f32;
|
||||
let start = if resize {
|
||||
rect.right_center()
|
||||
} else {
|
||||
rect.center()
|
||||
};
|
||||
let delta = if resize {
|
||||
1920.0 - before[1].x - before[1].width
|
||||
} else {
|
||||
-before[1].x
|
||||
};
|
||||
let end = start + Vec2::new(delta as f32 * scale - 3.0, 0.0);
|
||||
frame(
|
||||
&mut app,
|
||||
&ctx,
|
||||
vec![egui::Event::PointerMoved(start), mouse(start, true)],
|
||||
);
|
||||
frame(&mut app, &ctx, vec![egui::Event::PointerMoved(end)]);
|
||||
let snapped = app.layout.layers().clone();
|
||||
let edge = if resize {
|
||||
snapped[1].x + snapped[1].width
|
||||
} else {
|
||||
snapped[1].x
|
||||
};
|
||||
assert!(
|
||||
(edge - if resize { 1920.0 } else { 0.0 }).abs() < 0.001,
|
||||
"resize={resize} zoom={zoom} edge={edge} start={start:?} end={end:?}"
|
||||
);
|
||||
frame(&mut app, &ctx, vec![mouse(end, false)]);
|
||||
assert_eq!(
|
||||
*app.layout.layers(),
|
||||
snapped,
|
||||
"release must preserve snapping"
|
||||
);
|
||||
frame(&mut app, &ctx, vec![]);
|
||||
assert_eq!(*app.layout.layers(), snapped);
|
||||
app.layout.undo();
|
||||
assert_eq!(*app.layout.layers(), before);
|
||||
app.layout.redo();
|
||||
assert_eq!(*app.layout.layers(), snapped);
|
||||
}
|
||||
}
|
||||
}
|
||||
#[test]
|
||||
fn pointer_drag_is_one_edit_and_does_not_move_other_layer() {
|
||||
let mut app = Editor::default();
|
||||
let ctx = egui::Context::default();
|
||||
|
|
|
|||
Loading…
Reference in New Issue