File tree Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Expand file tree Collapse file tree 1 file changed +3
-2
lines changed Original file line number Diff line number Diff line change @@ -293,6 +293,7 @@ mod imp {
293
293
self . block_touch . replace ( block_touch) ;
294
294
self . canvas_touch_pan_update ( ) ;
295
295
self . canvas_zoom_gesture_update ( ) ;
296
+ self . canvas_kinetic_scrolling_update ( ) ;
296
297
}
297
298
"inertial-scrolling" => {
298
299
let inertial_scrolling = value
@@ -325,7 +326,7 @@ mod imp {
325
326
self . canvas_drag_gesture . set_propagation_phase ( PropagationPhase :: Bubble ) ;
326
327
self . touch_two_finger_long_press_gesture . set_propagation_phase ( PropagationPhase :: Capture ) ;
327
328
self . touch_long_press_gesture . set_propagation_phase ( PropagationPhase :: Capture ) ;
328
- } else {
329
+ } else { // set everythinbg to `None`
329
330
self . canvas_drag_gesture . set_propagation_phase ( PropagationPhase :: None ) ;
330
331
self . touch_two_finger_long_press_gesture . set_propagation_phase ( PropagationPhase :: None ) ;
331
332
self . touch_long_press_gesture . set_propagation_phase ( PropagationPhase :: None ) ;
@@ -334,7 +335,7 @@ mod imp {
334
335
335
336
fn canvas_kinetic_scrolling_update ( & self ) {
336
337
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 ( ) ,
338
339
) ;
339
340
}
340
341
You can’t perform that action at this time.
0 commit comments