raster pushed a commit to branch master.
http://git.enlightenment.org/core/efl.git/commit/?id=221b8075de10f473e21d929b1ca02b86b5e3635b
commit 221b8075de10f473e21d929b1ca02b86b5e3635b
Author: Carsten Haitzler (Rasterman) <ras...@rasterman.com>
Date: Tue Jun 1 23:39:00 2021 +0100
scroller - limit wheel accel a bit to something saner
---
src/lib/elementary/efl_ui_scroll_manager.c | 3 +++
src/lib/elementary/elm_interface_scrollable.c | 6 +++---
2 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/lib/elementary/efl_ui_scroll_manager.c
b/src/lib/elementary/efl_ui_scroll_manager.c
index 57edf11d65..885a5d0912 100644
--- a/src/lib/elementary/efl_ui_scroll_manager.c
+++ b/src/lib/elementary/efl_ui_scroll_manager.c
@@ -827,6 +827,9 @@ _scroll_wheel_post_event_cb(void *data, Evas *e EINA_UNUSED)
if (delta_t > 0.2) delta_t = 0.2;
mul = 1.0 + (_elm_config->scroll_accel_factor * ((0.2 - delta_t) / 0.2));
mul = mul * (1.0 + (0.15 * sd->last_wheel_mul));
+ if (d > 10) d = 10;
+ else if (d < -10) d = -10;
+ if (mul > 1000.0) mul = 1000.0;
d *= mul;
sd->last_wheel = ev->timestamp;
sd->last_wheel_mul = mul;
diff --git a/src/lib/elementary/elm_interface_scrollable.c
b/src/lib/elementary/elm_interface_scrollable.c
index 0721f94030..a9f18c25e7 100644
--- a/src/lib/elementary/elm_interface_scrollable.c
+++ b/src/lib/elementary/elm_interface_scrollable.c
@@ -2119,9 +2119,9 @@ _scroll_wheel_post_event_cb(void *data, Evas *e
EINA_UNUSED)
if (delta_t > 0.2) delta_t = 0.2;
mul = 1.0 + (_elm_config->scroll_accel_factor * ((0.2 - delta_t) /
0.2));
mul = mul * (1.0 + (0.15 * sid->last_wheel_mul));
- if (d > 1000) d = 1000;
- else if (d < -1000) d = -1000;
- if (mul > 100000.0) mul = 100000.0;
+ if (d > 10) d = 10;
+ else if (d < -10) d = -10;
+ if (mul > 1000.0) mul = 1000.0;
d *= mul;
sid->last_wheel = ev->timestamp;
sid->last_wheel_mul = mul;
--
