Skip to content

Commit 8532500

Browse files
committed
block inertial scrolling when deactivating touch
1 parent 90958f6 commit 8532500

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

crates/rnote-ui/src/canvaswrapper.rs

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -293,6 +293,7 @@ mod imp {
293293
self.block_touch.replace(block_touch);
294294
self.canvas_touch_pan_update();
295295
self.canvas_zoom_gesture_update();
296+
self.canvas_kinetic_scrolling_update();
296297
}
297298
"inertial-scrolling" => {
298299
let inertial_scrolling = value
@@ -325,7 +326,7 @@ mod imp {
325326
self.canvas_drag_gesture.set_propagation_phase(PropagationPhase::Bubble);
326327
self.touch_two_finger_long_press_gesture.set_propagation_phase(PropagationPhase::Capture);
327328
self.touch_long_press_gesture.set_propagation_phase(PropagationPhase::Capture);
328-
} else {
329+
} else { // set everythinbg to `None`
329330
self.canvas_drag_gesture.set_propagation_phase(PropagationPhase::None);
330331
self.touch_two_finger_long_press_gesture.set_propagation_phase(PropagationPhase::None);
331332
self.touch_long_press_gesture.set_propagation_phase(PropagationPhase::None);
@@ -334,7 +335,7 @@ mod imp {
334335

335336
fn canvas_kinetic_scrolling_update(&self) {
336337
self.scroller.set_kinetic_scrolling(
337-
!self.canvas.touch_drawing() && self.inertial_scrolling.get(),
338+
!self.block_touch.get() && !self.canvas.touch_drawing() && self.inertial_scrolling.get(),
338339
);
339340
}
340341

0 commit comments

Comments
 (0)