From 98fc85b68d4fd637ae5ceeb8c88e2d70c92ce318 Mon Sep 17 00:00:00 2001
From: Hombre <natureh.510@gmail.com>
Date: Tue, 4 Sep 2018 23:06:17 +0200
Subject: [PATCH] Revert GDK_SCROLL_SMOOTH scrolling of Toolbars to a fixed
 step

also remove GUI space in "FileBrowser" widget
see #4035
---
 rtgui/filecatalog.cc |  1 -
 rtgui/guiutils.cc    | 34 ++++++----------------------------
 2 files changed, 6 insertions(+), 29 deletions(-)

diff --git a/rtgui/filecatalog.cc b/rtgui/filecatalog.cc
index ae471dea5..2271c05c7 100644
--- a/rtgui/filecatalog.cc
+++ b/rtgui/filecatalog.cc
@@ -62,7 +62,6 @@ FileCatalog::FileCatalog (CoarsePanel* cp, ToolBar* tb, FilePanel* filepanel) :
     inTabMode = false;
 
     set_name ("FileBrowser");
-    set_spacing (2);
 
     //  construct and initialize thumbnail browsers
     fileBrowser = Gtk::manage( new FileBrowser() );
diff --git a/rtgui/guiutils.cc b/rtgui/guiutils.cc
index 76484ceba..447c9d8af 100644
--- a/rtgui/guiutils.cc
+++ b/rtgui/guiutils.cc
@@ -1008,45 +1008,23 @@ bool MyScrolledToolbar::on_scroll_event (GdkEventScroll* event)
         double value2 = 0.;
 
         if (event->direction == GDK_SCROLL_DOWN) {
-            value2 = value + step;
-
-            if (value2 > upper) {
-                value2 = upper;
-            }
-
+            value2 = rtengine::min<double>(value + step, upper);
             if (value2 != value) {
                 scroll->set_value(value2);
             }
         } else if (event->direction == GDK_SCROLL_UP) {
-            value2 = value - step;
-
-            if (value2 < lower) {
-                value2 = lower;
-            }
-
+            value2 = rtengine::max<double>(value - step, lower);
             if (value2 != value) {
                 scroll->set_value(value2);
             }
         } else if (event->direction == GDK_SCROLL_SMOOTH) {
-            step = 0.;
             if (event->delta_x) {  // if the user use a pad, it can scroll horizontally
-                step = event->delta_x;
+                value2 = rtengine::LIM<double>(value + (event->delta_x > 0 ? 30 : -30), lower, upper);
             } else if (event->delta_y) {
-                step = event->delta_y;
+                value2 = rtengine::LIM<double>(value + (event->delta_y > 0 ? 30 : -30), lower, upper);
             }
-
-            if (step != 0.) {
-                value2 = value + step /* * 2 */; // we could use a multiplicator here
-
-                if (value2 < lower) {
-                    value2 = lower;
-                } else if (value2 > upper) {
-                    value2 = upper;
-                }
-
-                if (value2 != value) {
-                    scroll->set_value(value2);
-                }
+            if (value2 != value) {
+                scroll->set_value(value2);
             }
         }
     }