mirror of
https://github.com/storytold/photocraft.git
synced 2026-11-16 23:24:22 +00:00
The options bar read the box's X scale as never negative and dropped the sign of the Y scale, so Flip Horizontal read W 100 %, H 100 %, 180° (typing 0° then flipped the layer vertically) and Flip Vertical read the same as an untouched box. A mirrored box now reads as a negative W or H, whichever keeps the angle nearer 0, as in Photoshop (Flip Horizontal: W -100 % at 0°, Flip Vertical: H -100 % at 0°). Typed W/H divide by a sign-preserving guard instead of max(1e-9). Co-authored-by: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
adbd40ef55
commit
94a135bc6b
1 file changed
+54
-3
@@ -2614,9 +2614,23 @@ fn quad_scale(t: &TransformSession) -> f32 {
|
||||
}
|
||||
|
||||
/// W and H (%), the angle (°) and the horizontal skew (°) the options bar shows for the box.
|
||||
/// A mirrored box reads as a negative W or H, whichever keeps the angle nearer 0 (Photoshop:
|
||||
/// Flip Horizontal is W -100 % at 0°, Flip Vertical H -100 % at 0°). Both are the same box:
|
||||
/// negating W and H and turning by a half turn cancel out.
|
||||
fn readout(t: &TransformSession) -> (f64, f64, f64, f64) {
|
||||
let p = Parts::of(t);
|
||||
(p.sx * 100.0, p.sy.abs() * 100.0, p.angle.to_degrees(), p.skew_h.to_degrees())
|
||||
let wrap = |a: f64| {
|
||||
let a = a.rem_euclid(std::f64::consts::TAU);
|
||||
if a > std::f64::consts::PI { a - std::f64::consts::TAU } else { a }
|
||||
};
|
||||
let turned = wrap(p.angle + std::f64::consts::PI);
|
||||
let (sx, sy, angle) = if p.sy < 0.0 && turned.abs() < wrap(p.angle).abs() { (-p.sx, -p.sy, turned) } else { (p.sx, p.sy, p.angle) };
|
||||
(sx * 100.0, sy * 100.0, angle.to_degrees(), p.skew_h.to_degrees())
|
||||
}
|
||||
|
||||
/// `v`, kept off zero with its sign: a divisor for a W or H scale that may be negative.
|
||||
fn nonzero(v: f64) -> f64 {
|
||||
if v.abs() < 1e-9 { 1e-9f64.copysign(v) } else { v }
|
||||
}
|
||||
|
||||
/// The box's affine part read as Photoshop's options bar does: the frame scaled (W, H), skewed
|
||||
@@ -2877,12 +2891,12 @@ pub(crate) fn position_size_fields(app: &mut PhotocraftApp, ui: &mut egui::Ui, t
|
||||
let (w, h) = (size_pct(&u, w, side_w) as f32, size_pct(&u, h, side_h) as f32);
|
||||
if rw.changed() || rh.changed() {
|
||||
let (kx, ky) = if link {
|
||||
let k = if rw.changed() { w as f64 / sx.max(1e-9) } else { h as f64 / sy.max(1e-9) };
|
||||
let k = if rw.changed() { w as f64 / nonzero(sx) } else { h as f64 / nonzero(sy) };
|
||||
// Linked, the other side follows: keep it within its own limit too.
|
||||
let k = k.min(f64::from(wlim) / sx.abs().max(1e-9)).min(f64::from(hlim) / sy.abs().max(1e-9));
|
||||
(k, k)
|
||||
} else {
|
||||
(w as f64 / sx.max(1e-9), h as f64 / sy.max(1e-9))
|
||||
(w as f64 / nonzero(sx), h as f64 / nonzero(sy))
|
||||
};
|
||||
scale_about_pivot(app, kx, ky);
|
||||
}
|
||||
@@ -3342,6 +3356,43 @@ mod tests {
|
||||
assert!(eq6(skew, 20.0), "{skew}");
|
||||
}
|
||||
|
||||
/// The test box flipped horizontally and vertically, as Edit › Transform › Flip leaves it.
|
||||
const FLIPPED_H: [[f64; 2]; 4] = [[100.0, 0.0], [0.0, 0.0], [0.0, 50.0], [100.0, 50.0]];
|
||||
const FLIPPED_V: [[f64; 2]; 4] = [[0.0, 50.0], [100.0, 50.0], [100.0, 0.0], [0.0, 0.0]];
|
||||
|
||||
/// Photoshop puts a flip's minus on the flipped axis and keeps the angle at 0: Flip Horizontal
|
||||
/// reads W -100 %, Flip Vertical H -100 % (it read 180° and nothing at all).
|
||||
#[test]
|
||||
fn a_flipped_box_reads_as_a_negative_scale_on_that_axis() {
|
||||
let mut t = session();
|
||||
for (quad, want) in [(FLIPPED_H, (-100.0, 100.0)), (FLIPPED_V, (100.0, -100.0))] {
|
||||
t.quad = quad;
|
||||
let (w, h, angle, skew) = readout(&t);
|
||||
assert!(eq6(w, want.0) && eq6(h, want.1) && eq6(angle, 0.0) && eq6(skew, 0.0), "{quad:?}: {w} {h} {angle} {skew}");
|
||||
}
|
||||
// Flipped both ways is a half turn, not a mirror.
|
||||
t.quad = [[100.0, 50.0], [0.0, 50.0], [0.0, 0.0], [100.0, 0.0]];
|
||||
let (w, h, angle, _) = readout(&t);
|
||||
assert!(eq6(w, 100.0) && eq6(h, 100.0) && eq6(angle.abs(), 180.0), "{w} {h} {angle}");
|
||||
}
|
||||
|
||||
/// The bar's fields act on a flipped box without undoing the flip: angle 0 keeps it as it is,
|
||||
/// and a typed W scales it and keeps it mirrored.
|
||||
#[test]
|
||||
fn bar_fields_keep_a_flipped_box_flipped() {
|
||||
let flip_h = |app: &mut PhotocraftApp| app.ui.transform.as_mut().unwrap().quad = FLIPPED_H;
|
||||
let t = type_into_bar_field_with(flip_h, 4, "0");
|
||||
assert!(t.quad.iter().flatten().zip(FLIPPED_H.iter().flatten()).all(|(a, b)| eq6(*a, *b)), "{:?}", t.quad);
|
||||
let t = type_into_bar_field_with(flip_h, 2, "-50");
|
||||
let (w, h, angle, _) = readout(&t);
|
||||
assert!(eq6(w, -50.0) && eq6(h, 50.0) && eq6(angle, 0.0), "{w} {h} {angle}");
|
||||
assert!(eq6(t.quad[0][0] - t.quad[1][0], 50.0), "50 px wide, still mirrored: {:?}", t.quad);
|
||||
let flip_v = |app: &mut PhotocraftApp| app.ui.transform.as_mut().unwrap().quad = FLIPPED_V;
|
||||
let t = type_into_bar_field_with(flip_v, 3, "-200");
|
||||
let (w, h, _, _) = readout(&t);
|
||||
assert!(eq6(w, 200.0) && eq6(h, -200.0), "{w} {h}");
|
||||
}
|
||||
|
||||
/// Typing H and V skews leans the box about the reference point; the angle, W and H fields keep
|
||||
/// their values, and V stays as typed.
|
||||
#[test]
|
||||
|
||||
Reference in new issue
Block a user