From 249876523d732eb000697fb6e8bbed53897d69d8 Mon Sep 17 00:00:00 2001
From: Emil Ernerfeldt <emil.ernerfeldt@gmail.com>
Date: Tue, 7 Sep 2021 19:45:13 +0200
Subject: [PATCH] Increase scroll-speed on glium from 8 to 50 points per scroll
 tick

Closes https://github.com/emilk/egui/issues/461
Closes https://github.com/emilk/egui/pull/702
---
 eframe/CHANGELOG.md     |  1 +
 egui_glium/CHANGELOG.md |  2 ++
 egui_glium/src/lib.rs   |  4 ++--
 egui_web/CHANGELOG.md   | 14 +++++++-------
 egui_web/src/lib.rs     |  3 ++-
 5 files changed, 14 insertions(+), 10 deletions(-)

diff --git a/eframe/CHANGELOG.md b/eframe/CHANGELOG.md
index 19963ba3b3d..ad511dd9565 100644
--- a/eframe/CHANGELOG.md
+++ b/eframe/CHANGELOG.md
@@ -4,6 +4,7 @@ All notable changes to the `eframe` crate.
 
 ## Unreleased
 * Remove "http" feature (use https://github.com/emilk/ehttp instead!).
+* Increase scroll speed.
 
 
 ## 0.14.0 - 2021-08-24
diff --git a/egui_glium/CHANGELOG.md b/egui_glium/CHANGELOG.md
index e7929782ab2..0e089ad7509 100644
--- a/egui_glium/CHANGELOG.md
+++ b/egui_glium/CHANGELOG.md
@@ -7,6 +7,8 @@ All notable changes to the `egui_glium` integration will be noted in this file.
 * Remove "http" feature (use https://github.com/emilk/ehttp instead!).
 * Add `epi::NativeTexture` trait for glium painter
 * Deprecate 'Painter::register_glium_texture'
+* Increase scroll speed.
+
 
 ## 0.14.0 - 2021-08-24
 * Fix native file dialogs hanging (eg. when using [`rfd`](https://github.com/PolyMeilex/rfd)).
diff --git a/egui_glium/src/lib.rs b/egui_glium/src/lib.rs
index 2317e54406b..a280ce86ae7 100644
--- a/egui_glium/src/lib.rs
+++ b/egui_glium/src/lib.rs
@@ -251,8 +251,8 @@ pub fn input_to_egui(
         WindowEvent::MouseWheel { delta, .. } => {
             let mut delta = match *delta {
                 glutin::event::MouseScrollDelta::LineDelta(x, y) => {
-                    let line_height = 8.0; // magic value!
-                    vec2(x, y) * line_height
+                    let points_per_scroll_line = 50.0; // Scroll speed decided by consensus: https://github.com/emilk/egui/issues/461
+                    vec2(x, y) * points_per_scroll_line
                 }
                 glutin::event::MouseScrollDelta::PixelDelta(delta) => {
                     vec2(delta.x as f32, delta.y as f32) / pixels_per_point
diff --git a/egui_web/CHANGELOG.md b/egui_web/CHANGELOG.md
index 1a5ce2de305..ce2975b6c56 100644
--- a/egui_web/CHANGELOG.md
+++ b/egui_web/CHANGELOG.md
@@ -4,21 +4,22 @@ All notable changes to the `egui_web` integration will be noted in this file.
 
 
 ## Unreleased
-
 ### Added
 * Remove "http" feature (use https://github.com/emilk/ehttp instead!).
 * `epi::NativeTexture` trait for webgl1 webgl2 painter
-* Deprecate `Painter::register_webgl_texture` 
+* Deprecate `Painter::register_webgl_texture`
 
-## 0.14.1 - 2021-08-28
+### Changed 🔧
+* Increase scroll speed.
 
+
+## 0.14.1 - 2021-08-28
 ### Fixed 🐛
 * Fix alpha blending for WebGL2 and WebGL1 with sRGB support backends, now having identical results as egui_glium.
 * Fix use of egui on devices with both touch and mouse.
 
 
 ## 0.14.0 - 2021-08-24
-
 ### Added ⭐
 * Added support for dragging and dropping files into the browser window.
 
@@ -27,7 +28,6 @@ All notable changes to the `egui_web` integration will be noted in this file.
 
 
 ## 0.13.0 - 2021-06-24
-
 ### Changed 🔧
 * Default to light visuals unless the system reports a preference for dark mode.
 
@@ -37,19 +37,18 @@ All notable changes to the `egui_web` integration will be noted in this file.
 
 
 ## 0.12.0 - 2021-05-10
-
 ### Fixed 🐛
 * Scroll faster when scrolling with mouse wheel.
 
 
 ## 0.11.0 - 2021-04-05
-
 ### Added ⭐
 * [Fix mobile and IME text input](https://github.com/emilk/egui/pull/253)
 * Hold down a modifier key when clicking a link to open it in a new tab.
 
 Contributors: [n2](https://github.com/n2)
 
+
 ## 0.10.0 - 2021-02-28
 ### Added ⭐
 * You can control the maximum egui canvas size with `App::max_size_points`.
@@ -90,6 +89,7 @@ Contributors: [n2](https://github.com/n2)
 * Set a maximum canvas size to alleviate performance issues on some machines
 * Simplify `egui_web::start` arguments
 
+
 ## 0.4.0 - 2020-11-28
 ### Added ⭐
 * A simple HTTP fetch API (wraps `web_sys`).
diff --git a/egui_web/src/lib.rs b/egui_web/src/lib.rs
index 6b5a19ca74e..9d132ac97a1 100644
--- a/egui_web/src/lib.rs
+++ b/egui_web/src/lib.rs
@@ -1048,7 +1048,8 @@ fn install_canvas_events(runner_ref: &AppRunnerRef) -> Result<(), JsValue> {
                     canvas_size_in_points(runner_ref.0.lock().canvas_id()).y
                 }
                 web_sys::WheelEvent::DOM_DELTA_LINE => {
-                    8.0 // magic value!
+                    let points_per_scroll_line = 50.0; // Scroll speed decided by consensus: https://github.com/emilk/egui/issues/461
+                    points_per_scroll_line
                 }
                 _ => 1.0,
             };