Skip to content

Commit f870f5c

Browse files
443eb9443eb9
committed
rename WheelScrolled back to keep naming consistent
1 parent 1788cf4 commit f870f5c

10 files changed

Lines changed: 26 additions & 24 deletions

File tree

‎core/src/pointer/event.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ pub enum Event {
4848
},
4949

5050
/// A mouse wheel or touchpad was scrolled.
51-
MouseWheel {
51+
WheelScrolled {
5252
/// The scroll movement.
5353
delta: mouse::ScrollDelta,
5454
},

‎core/src/text/editor.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -417,7 +417,7 @@ impl State {
417417

418418
Some(Update::Action(Action::Drag(position)))
419419
}
420-
Event::Pointer(pointer::Event::MouseWheel { delta }) if cursor.is_over(bounds) => {
420+
Event::Pointer(pointer::Event::WheelScrolled { delta }) if cursor.is_over(bounds) => {
421421
let bounds = editor.bounds();
422422

423423
if bounds.height >= i32::MAX as f32 {

‎examples/game_of_life/src/main.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -456,7 +456,7 @@ mod grid {
456456
_ => action.and_capture(),
457457
})
458458
}
459-
Event::Pointer(pointer::Event::MouseWheel { delta }) => match *delta {
459+
Event::Pointer(pointer::Event::WheelScrolled { delta }) => match *delta {
460460
mouse::ScrollDelta::Lines { y, .. } | mouse::ScrollDelta::Pixels { y, .. } => {
461461
if y < 0.0 && self.scaling > Self::MIN_SCALING
462462
|| y > 0.0 && self.scaling < Self::MAX_SCALING

‎widget/src/image/viewer.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -160,7 +160,7 @@ where
160160
let bounds = layout.bounds();
161161

162162
match event {
163-
Event::Pointer(pointer::Event::MouseWheel { delta }) => {
163+
Event::Pointer(pointer::Event::WheelScrolled { delta }) => {
164164
let Some(cursor_position) = cursor.position_over(bounds) else {
165165
return;
166166
};

‎widget/src/mouse_area.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -400,7 +400,7 @@ fn update<Message: Clone, Theme, Renderer>(
400400
shell.publish(message.clone());
401401
}
402402
}
403-
Event::Pointer(pointer::Event::MouseWheel { delta }) => {
403+
Event::Pointer(pointer::Event::WheelScrolled { delta }) => {
404404
if let Some(on_scroll) = widget.on_scroll.as_ref() {
405405
shell.publish(on_scroll(*delta));
406406
shell.capture_event();

‎widget/src/pick_list.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -467,7 +467,7 @@ where
467467
shell.capture_event();
468468
}
469469
}
470-
Event::Pointer(pointer::Event::MouseWheel {
470+
Event::Pointer(pointer::Event::WheelScrolled {
471471
delta: mouse::ScrollDelta::Lines { y, .. },
472472
}) => {
473473
let Some(on_select) = &self.on_select else {

‎widget/src/scrollable.rs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -705,7 +705,7 @@ where
705705
event,
706706
Event::Pointer(
707707
pointer::Event::PointerPressed { .. }
708-
| pointer::Event::MouseWheel { .. }
708+
| pointer::Event::WheelScrolled { .. }
709709
| pointer::Event::PointerEntered {
710710
kind: pointer::Kind::Touch(_),
711711
..
@@ -732,7 +732,7 @@ where
732732
}
733733

734734
if state.last_scrolled.is_none()
735-
|| !matches!(event, Event::Pointer(pointer::Event::MouseWheel { .. }))
735+
|| !matches!(event, Event::Pointer(pointer::Event::WheelScrolled { .. }))
736736
{
737737
let translation = state.translation(self.direction, bounds, content_bounds);
738738

@@ -786,7 +786,7 @@ where
786786
}
787787

788788
match event {
789-
Event::Pointer(pointer::Event::MouseWheel { delta }) => {
789+
Event::Pointer(pointer::Event::WheelScrolled { delta }) => {
790790
if cursor_over_scrollable.is_none() {
791791
return;
792792
}

‎widget/src/slider.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -360,7 +360,7 @@ where
360360

361361
shell.capture_event();
362362
}
363-
Event::Pointer(pointer::Event::MouseWheel { delta })
363+
Event::Pointer(pointer::Event::WheelScrolled { delta })
364364
if state.keyboard_modifiers.control() && cursor.is_over(layout.bounds()) =>
365365
{
366366
let delta = match delta {

‎widget/src/vertical_slider.rs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -363,7 +363,7 @@ where
363363

364364
shell.capture_event();
365365
}
366-
Event::Pointer(pointer::Event::MouseWheel { delta })
366+
Event::Pointer(pointer::Event::WheelScrolled { delta })
367367
if state.keyboard_modifiers.control() && cursor.is_over(layout.bounds()) =>
368368
{
369369
let delta = match *delta {

‎winit/src/conversion.rs‎

Lines changed: 15 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -212,20 +212,22 @@ pub fn window_event(
212212
}
213213
}))
214214
}
215-
WindowEvent::MouseWheel { delta, .. } => Some(Event::Pointer(pointer::Event::MouseWheel {
216-
delta: match delta {
217-
winit::event::MouseScrollDelta::LineDelta(x, y) => {
218-
pointer::mouse::ScrollDelta::Lines { x, y }
219-
}
220-
winit::event::MouseScrollDelta::PixelDelta(position) => {
221-
pointer::mouse::ScrollDelta::Pixels {
222-
x: position.x as f32,
223-
y: position.y as f32,
215+
WindowEvent::MouseWheel { delta, .. } => {
216+
Some(Event::Pointer(pointer::Event::WheelScrolled {
217+
delta: match delta {
218+
winit::event::MouseScrollDelta::LineDelta(x, y) => {
219+
pointer::mouse::ScrollDelta::Lines { x, y }
224220
}
225-
}
226-
_ => return None,
227-
},
228-
})),
221+
winit::event::MouseScrollDelta::PixelDelta(position) => {
222+
pointer::mouse::ScrollDelta::Pixels {
223+
x: position.x as f32,
224+
y: position.y as f32,
225+
}
226+
}
227+
_ => return None,
228+
},
229+
}))
230+
}
229231
// Ignore keyboard presses/releases during window focus/unfocus
230232
WindowEvent::KeyboardInput { is_synthetic, .. } if is_synthetic => None,
231233
WindowEvent::KeyboardInput { event, .. } => Some(Event::Keyboard({

0 commit comments

Comments
 (0)