aleleba/deckcraft
1
0
Fork 0
mirror of https://github.com/storytold/deckcraft.git synced 2026-10-24 10:37:03 -06:00
Code Issues Packages Projects Releases Wiki Activity

Fix up merged PRs: zoom anchors on the unsnapped slide rect; zoom tests allow the pixel-grid snap

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Brandon Thomas
2026-10-14 15:02:43 -04:00
co-authored by Claude Opus 5.5
parent 95cb3be9e6
commit 330fc16c8c
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/canvas.rs
+8 -4
View File
@@ -109,12 +109,14 @@ pub fn show(app: &mut SlideApp, ui: &mut Ui) {
}
offset.x = offset.x.clamp(0.0, overflow.x);
offset.y = offset.y.clamp(0.0, overflow.y);
// On the physical pixel grid, so the slide texture is one texel per device pixel (#184).
// On the physical pixel grid, so the slide texture is one texel per device pixel (#184). The
// zoom anchor keeps the unsnapped rect, so snapping never accumulates into drift.
let ppp = ui.ctx().pixels_per_point();
let slide_rect = crate::textures::device_pixel_rect(content_rect.translate(-offset), ppp);
let exact_rect = content_rect.translate(-offset);
let slide_rect = crate::textures::device_pixel_rect(exact_rect, ppp);
ui.data_mut(|d| {
d.insert_temp(scroll_id, offset);
d.insert_temp(last_id, (slide_rect, scale));
d.insert_temp(last_id, (exact_rect, scale));
});
app.slide_rect = Some(slide_rect);
app.canvas_scale = scale;
@@ -907,8 +909,10 @@ mod tests {
h.run_steps(30);
}
/// Within half a slide point, plus the half device pixel the slide moves to sit on the pixel
/// grid (#184).
fn assert_near(a: Pos2, b: Pos2, what: &str) {
assert!((a - b).length() < 0.5, "{what}: {a:?} moved to {b:?}");
assert!((a - b).length() < 1.25, "{what}: {a:?} moved to {b:?}");
}
/// #106: wheel and pinch zoom zoomed toward the slide's corner instead of the pointer.