Merge remote-tracking branch 'upstream/master' into yoda-wayland-only

widget/src/lib.rs

@@ -9,6 +9,8 @@ pub use iced_renderer::graphics;
 
 pub use core::widget::Id;
 
+pub(crate) const DRAG_DEADBAND_DISTANCE: f32 = 10.0;
+
 mod action;
 mod mouse_area;
 mod pin;

widget/src/pane_grid.rs

@@ -92,7 +92,8 @@ use crate::core::{
 };
 use log::trace;
 
-const DRAG_DEADBAND_DISTANCE: f32 = 10.0;
+use crate::DRAG_DEADBAND_DISTANCE;
+
 const THICKNESS_RATIO: f32 = 25.0;
 
 /// A collection of panes distributed using either vertical or horizontal splits

widget/src/scrollable.rs

@@ -960,6 +960,16 @@ where
                             y: y + translation.y as f64,
                         },
                     )),
+                    Event::Touch(touch::Event::FingerLifted {
+                        id,
+                        position,
+                    }) if matches!(
+                        state.interaction,
+                        Interaction::TouchScrolling(_)
+                    ) =>
+                    {
+                        Event::Touch(touch::Event::FingerLost { id, position })
+                    }
                     e => e,
                 };
                 self.content.as_widget_mut().update(
@@ -987,6 +997,14 @@ where
                 }
             };
 
+            if matches!(
+                event,
+                Event::Mouse(mouse::Event::CursorMoved { .. })
+                    | Event::Touch(touch::Event::FingerPressed { .. })
+            ) {
+                state.suppress_touch_hover = false;
+            }
+
             if matches!(
                 event,
                 Event::Mouse(mouse::Event::ButtonReleased(mouse::Button::Left))
@@ -995,10 +1013,18 @@ where
                             | touch::Event::FingerLost { .. }
                     )
             ) {
+                if matches!(state.interaction, Interaction::TouchScrolling(_)) {
+                    state.suppress_touch_hover = true;
+                }
                 state.interaction = Interaction::None;
+                state.touch_press_start = None;
                 return;
             }
 
+            if let Event::Touch(touch::Event::FingerPressed { .. }) = event {
+                state.touch_press_start = cursor_over_scrollable;
+            }
+
             if shell.is_event_captured() {
                 return;
             }
@@ -1092,14 +1118,31 @@ where
                                 Interaction::TouchScrolling(position);
                         }
                         touch::Event::FingerMoved { .. } => {
-                            let Interaction::TouchScrolling(
+                            let Some(cursor_position) = cursor.position()
-                                scroll_box_touched_at,
-                            ) = state.interaction
                             else {
                                 return;
                             };
 
-                            let Some(cursor_position) = cursor.position()
+                            if !matches!(
+                                state.interaction,
+                                Interaction::TouchScrolling(_)
+                            ) {
+                                let Some(start) = state.touch_press_start
+                                else {
+                                    return;
+                                };
+                                if start.distance(cursor_position)
+                                    < crate::DRAG_DEADBAND_DISTANCE
+                                {
+                                    return;
+                                }
+                                state.interaction =
+                                    Interaction::TouchScrolling(start);
+                            }
+
+                            let Interaction::TouchScrolling(
+                                scroll_box_touched_at,
+                            ) = state.interaction
                             else {
                                 return;
                             };
@@ -1321,6 +1364,14 @@ where
             state.translation(self.direction, bounds, content_bounds);
 
         let cursor = match cursor_over_scrollable {
+            _ if state.suppress_touch_hover
+                || matches!(
+                    state.interaction,
+                    Interaction::TouchScrolling(_)
+                ) =>
+            {
+                mouse::Cursor::Unavailable
+            }
             Some(cursor_position)
                 if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
             {
@@ -1496,6 +1547,14 @@ where
             state.translation(self.direction, bounds, content_bounds);
 
         let cursor = match cursor_over_scrollable {
+            _ if state.suppress_touch_hover
+                || matches!(
+                    state.interaction,
+                    Interaction::TouchScrolling(_)
+                ) =>
+            {
+                cursor.levitate() + translation
+            }
             Some(cursor_position)
                 if !(mouse_over_x_scrollbar || mouse_over_y_scrollbar) =>
             {
@@ -2021,6 +2080,8 @@ struct State {
     last_notified: Option<Viewport>,
     last_scrolled: Option<Instant>,
     is_scrollbar_visible: bool,
+    touch_press_start: Option<Point>,
+    suppress_touch_hover: bool,
 }
 
 #[derive(Debug, Clone, Copy)]
@@ -2046,6 +2107,8 @@ impl Default for State {
             last_notified: None,
             last_scrolled: None,
             is_scrollbar_visible: true,
+            touch_press_start: None,
+            suppress_touch_hover: false,
         }
     }
 }