fix(metafile): retain WMF player target across viewport scaling

This commit is contained in:
Dylan M. Taylor
2026-11-15 23:50:34 -05:00
parent aaa7230822
commit 7585d2df79
2 changed files with 25 additions and 7 deletions
+17
View File
@@ -2727,3 +2727,20 @@ fn wmf_scale_window_ext_and_offset_origins_change_the_mapping() {
let got = extent(vec![wrec(0x0412, &cat(vec![h16(0), h16(1), h16(0), h16(1)]))]);
assert!(close(got.0, 10.0) && close(got.1, 10.0) && close(got.2, 20.0) && close(got.3, 20.0), "zero denominator: {got:?}");
}
#[test]
fn wmf_viewport_scaling_does_not_resize_the_player_frame() {
for numerator in [1, 4] {
let recs = [
wrec(0x0103, &h16(8)),
wrec(0x020C, &cat(vec![h16(100), h16(100)])),
wrec(0x041B, &cat(vec![h16(100), h16(100), h16(0), h16(0)])),
// Change the mapping after drawing, without a matching RESTOREDC.
wrec(0x0412, &cat(vec![h16(1), h16(1), h16(2), h16(numerator)])),
];
let p = parse(&wmf(&recs, None)).unwrap();
assert_eq!((p.width, p.height), (100.0, 100.0));
assert_eq!(p.skipped_records, 0);
assert_eq!(rect_extent(&p.items[0]), (0.0, 0.0, 100.0, 100.0));
}
}
+8 -7
View File
@@ -50,7 +50,8 @@ pub(crate) fn parse(input: Bytes) -> Result<(Canvas, Option<Frame>), Error> {
cv.set_clip_surface([0.0, 0.0, size.0, size.1]);
cv.pattern_px = PT_PER_PX;
}
let mut player_viewport = bounds.is_some();
// Keep the player target independent of subsequent mapping changes.
let mut player_target = bounds.map(|(_, size)| size);
let mut parsed = 0usize;
while !cv.full() {
let (Some(words), Some(func)) = (input.u32(pos), pos.checked_add(4).and_then(|o| input.u16(o))) else { break };
@@ -60,10 +61,11 @@ pub(crate) fn parse(input: Bytes) -> Result<(Canvas, Option<Frame>), Error> {
break;
}
record(&mut cv, func, Bytes(rec));
if func == 0x020C && cv.window_set && !player_viewport && !cv.viewport_set {
if func == 0x020C && cv.window_set && player_target.is_none() && !cv.viewport_set {
let we = cv.map.window_ext();
cv.play_into(None, (we.0.abs(), we.1.abs()));
player_viewport = true;
let target = (we.0.abs(), we.1.abs());
cv.play_into(None, target);
player_target = Some(target);
}
parsed += 1;
let Some(next) = pos.checked_add(len) else { break };
@@ -82,9 +84,8 @@ pub(crate) fn parse(input: Bytes) -> Result<(Canvas, Option<Frame>), Error> {
let rect = [a.0.min(b.0), a.1.min(b.1), (b.0 - a.0).abs(), (b.1 - a.1).abs()];
(rect[2] > 0.0 && rect[3] > 0.0).then_some(Frame { rect, size: Some(size) })
}
None if player_viewport && !cv.viewport_set && cv.map.uses_extents() => {
let ve = cv.map.viewport_ext();
Some(Frame { rect: [0.0, 0.0, ve.0, ve.1], size: None })
None if !cv.viewport_set && cv.map.uses_extents() && player_target.is_some() => {
player_target.map(|(w, h)| Frame { rect: [0.0, 0.0, w, h], size: None })
}
None if cv.window_set => Some(Frame { rect: cv.map.window_rect(), size: None }),
None => None,