From da6f64fdbc7cd24ce4c2a09d4612062967bae6d2 Mon Sep 17 00:00:00 2001 From: MStarha Date: Fri, 6 Dec 2024 20:02:45 +0100 Subject: [PATCH] Implement mouse wheel multiplier --- crates/egui/src/containers/scroll_area.rs | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/crates/egui/src/containers/scroll_area.rs b/crates/egui/src/containers/scroll_area.rs index 3f5894e87d5..3aa1ba2cd33 100644 --- a/crates/egui/src/containers/scroll_area.rs +++ b/crates/egui/src/containers/scroll_area.rs @@ -284,8 +284,8 @@ pub struct ScrollArea { offset_y: Option, on_hover_cursor: Option, on_drag_cursor: Option, - scroll_source: ScrollSource, + wheel_scroll_multiplier: Vec2, /// If true for vertical or horizontal the scroll wheel will stick to the /// end position until user manually changes position. It will become true @@ -338,6 +338,7 @@ impl ScrollArea { on_hover_cursor: None, on_drag_cursor: None, scroll_source: ScrollSource::default(), + wheel_scroll_multiplier: Vec2::splat(1.0), stick_to_end: Vec2b::FALSE, animated: true, } @@ -556,6 +557,17 @@ impl ScrollArea { self } + /// The scroll amount caused by a mouse wheel scroll is multiplied by this amount. + /// + /// Independent for each scroll direction. Defaults to `Vec2{x: 1.0, y: 1.0}`. + /// + /// This can invert or effectively disable mouse scrolling. + #[inline] + pub fn wheel_scroll_multiplier(mut self, multiplier: Vec2) -> Self { + self.wheel_scroll_multiplier = multiplier; + self + } + /// For each axis, should the containing area shrink if the content is small? /// /// * If `true`, egui will add blank space outside the scroll area. @@ -643,6 +655,7 @@ struct Prepared { viewport: Rect, scroll_source: ScrollSource, + wheel_scroll_multiplier: Vec2, stick_to_end: Vec2b, animated: bool, } @@ -662,6 +675,7 @@ impl ScrollArea { on_hover_cursor, on_drag_cursor, scroll_source, + wheel_scroll_multiplier, stick_to_end, animated, } = self; @@ -865,6 +879,7 @@ impl ScrollArea { content_ui, viewport, scroll_source, + wheel_scroll_multiplier, stick_to_end, animated, } @@ -978,6 +993,7 @@ impl Prepared { content_ui, viewport: _, scroll_source, + wheel_scroll_multiplier, stick_to_end, animated, } = self; @@ -1099,6 +1115,7 @@ impl Prepared { input.smooth_scroll_delta[d] } }); + let scroll_delta = scroll_delta * wheel_scroll_multiplier[d]; let scrolling_up = state.offset[d] > 0.0 && scroll_delta > 0.0; let scrolling_down = state.offset[d] < max_offset[d] && scroll_delta < 0.0;