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

UI: drop the wheel carry whenever another presentation is drawn

Browse Source 
The presentation check on the leftover wheel fraction ran only while the
canvas was hovered and fitted, so switching to another presentation from
the tabs and back kept the old fraction. It now runs every frame the canvas
draws a presentation, before the hover and overflow branches.

Test: 0.75 of a line in one presentation, a switch away and back with the
pointer off the canvas, then 0.25 does not turn the page.

Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
kinower
2026-10-22 09:52:50 +02:00
co-authored by Claude Opus 5.5
parent e11c7e4d7e
commit dffef33960
2 changed files with 28 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files
crates/ui-egui/src/canvas.rs
+10 -7
View File
@@ -142,6 +142,15 @@ pub fn show(app: &mut SlideApp, ui: &mut Ui) {
let avail = ui.available_rect_before_wrap();
app.canvas_rect = Some(avail);
let Some(st) = app.session.active() else { return };
// The leftover fraction of a wheel line belongs to one presentation. Drop it whenever another
// one is drawn here, hovered or not, so switching away and back starts from zero.
let carry_id = ui.id().with("wheel_carry");
let doc_uid = st.uid;
ui.data_mut(|d| {
if d.get_temp::<(u64, f32)>(carry_id).is_none_or(|(uid, _)| uid != doc_uid) {
d.insert_temp(carry_id, (doc_uid, 0.0_f32));
}
});
if st.doc.slides.is_empty() && st.selection.target == Target::Slides {
let resp = ui.allocate_rect(avail, Sense::click());
ui.painter().text(avail.center(), Align2::CENTER_CENTER, "Click to add first slide", theme::font(22.0), t.text_dim);
@@ -177,13 +186,7 @@ pub fn show(app: &mut SlideApp, ui: &mut Ui) {
if overflow != egui::Vec2::ZERO {
offset -= wheel;
} else if !app.anim_preview_active() && app.session.tool.marquee.is_none() && !app.session.tool.dragging() {
// The leftover fraction belongs to one presentation: another one starts from zero.
let carry_id = ui.id().with("wheel_carry");
let (carry_doc, mut carry): (Option<u64>, f32) = ui.data_mut(|d| d.get_temp(carry_id).unwrap_or_default());
let doc_uid = app.session.active().map(|d| d.uid);
if carry_doc != doc_uid {
carry = 0.0;
}
let (_, mut carry): (u64, f32) = ui.data_mut(|d| d.get_temp(carry_id).unwrap_or_default());
let wheel_step = app.session.active().and_then(|d| {
let current = d.selection.slide;
ui.input(|i| wheel_slide_target(&i.events, current, d.doc.slides.len(), &mut carry)).map(|target| (current, target))
crates/ui-egui/src/lib.rs
+18
View File
@@ -3393,6 +3393,7 @@ mod tests {
mouse_wheel(&mut h, &[-0.75]);
assert_eq!(slide_at(h.state()), 0);
let a = h.state().session.active_index().unwrap();
h.state_mut().run("file.new", json!({})).unwrap();
h.state_mut().run("slide.new", json!({})).unwrap();
h.state_mut().run("slide.go", json!({"index": 0})).unwrap();
@@ -3402,6 +3403,23 @@ mod tests {
assert_eq!(slide_at(h.state()), 0, "a quarter line in the new presentation does not turn the page");
mouse_wheel(&mut h, &[-0.75]);
assert_eq!(slide_at(h.state()), 1, "a whole line in the new presentation does");
// Back in the first one, leave 0.75 of a line, then switch away and back with the pointer
// off the canvas (on the tabs): the canvas never sees a hover in the other presentation.
let b = h.state().session.active_index().unwrap();
h.state_mut().session.set_active(a);
h.state_mut().ui.zoom = Some(0.4);
h.run_steps(2);
mouse_wheel(&mut h, &[-0.75]);
assert_eq!(slide_at(h.state()), 0);
h.input_mut().events.push(egui::Event::PointerMoved(egui::pos2(-10.0, -10.0)));
h.run_steps(1);
h.state_mut().session.set_active(b);
h.run_steps(2);
h.state_mut().session.set_active(a);
h.run_steps(2);
mouse_wheel(&mut h, &[-0.25]);
assert_eq!(slide_at(h.state()), 0, "switching away without a hover still drops the fraction");
}
#[test]