From 8d64dd06b66d288bb54affec721116829383d284 Mon Sep 17 00:00:00 2001
From: Nikolay <MPolianovskyi@wavesglobal.com>
Date: Wed, 25 Feb 2015 15:14:49 +0200
Subject: [PATCH] [Summary] Changed mouse wheel step for mixer strip and
 inspector faders. Now mouse wheel step equal to 1 pixel. [Feature reviewed]
 MKosharnyy AMishyn [Reviewed] VKamyshniy

===NEEDS PAUL's REVIEW===
---
 gtk2_ardour/gain_meter.cc               |  6 ------
 gtk2_ardour/ui/inspector_gain_meter.xml |  3 ++-
 gtk2_ardour/ui/mixer_gain_meter.xml     |  3 ++-
 libs/gtkmm2ext/fader.cc                 | 14 ++------------
 4 files changed, 6 insertions(+), 20 deletions(-)

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 483039ba9c..626c396e38 100644
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -84,8 +84,6 @@ GainMeter::GainMeter (Session* s, const std::string& layout_script_file)
 	gain_adjustment.set_value (gain_to_slider_position_with_max (1.0, Config->get_max_gain()));
 	gain_adjustment.set_lower (0.0);
 	gain_adjustment.set_upper (1.0);
-	gain_adjustment.set_step_increment (0.01);
-	gain_adjustment.set_page_increment (0.1);
 	set_session (s);
 
 	ignore_toggle = false;
@@ -240,15 +238,11 @@ GainMeter::setup_gain_adjustment ()
 		_data_type = DataType::AUDIO;
 		gain_adjustment.set_lower (0.0);
 		gain_adjustment.set_upper (1.0);
-		gain_adjustment.set_step_increment (0.01);
-		gain_adjustment.set_page_increment (0.1);
 		gain_slider.set_default_value (gain_to_slider_position (1));
 	} else {
 		_data_type = DataType::MIDI;
 		gain_adjustment.set_lower (0.0);
 		gain_adjustment.set_upper (2.0);
-		gain_adjustment.set_step_increment (1.0/128.0);
-		gain_adjustment.set_page_increment (10.0/128.0);
 		gain_slider.set_default_value (1.0);
 	}
 
diff --git a/gtk2_ardour/ui/inspector_gain_meter.xml b/gtk2_ardour/ui/inspector_gain_meter.xml
index 3c9969c18b..e49c6f29d6 100644
--- a/gtk2_ardour/ui/inspector_gain_meter.xml
+++ b/gtk2_ardour/ui/inspector_gain_meter.xml
@@ -3,7 +3,8 @@
             thinmeterwidth="6">
   <Adjustment id="gain_adjustment"
               minvalue="0"
-              maxvalue="1"/>
+              maxvalue="1"
+              step="0.00535"/>
   <Layout bgnormal="#383838"
           width="97"
           height="258">
diff --git a/gtk2_ardour/ui/mixer_gain_meter.xml b/gtk2_ardour/ui/mixer_gain_meter.xml
index ac22bc8c43..9671256edf 100644
--- a/gtk2_ardour/ui/mixer_gain_meter.xml
+++ b/gtk2_ardour/ui/mixer_gain_meter.xml
@@ -3,7 +3,8 @@
             thinmeterwidth="6">
   <Adjustment id="gain_adjustment"
           minvalue="0"
-          maxvalue="1"/>
+          maxvalue="1"
+          step="0.00535"/>
   <VBox>
     <Button id="peak_display_button"
             width="58" height="18"
diff --git a/libs/gtkmm2ext/fader.cc b/libs/gtkmm2ext/fader.cc
index a59da7acdc..95f35a25ab 100755
--- a/libs/gtkmm2ext/fader.cc
+++ b/libs/gtkmm2ext/fader.cc
@@ -307,26 +307,16 @@ Fader::on_scroll_event (GdkEventScroll* ev)
 	}
 
 	bool ret = false;
-	double scale;
-	if (ev->state & Keyboard::GainFineScaleModifier) {
-		if (ev->state & Keyboard::GainExtraFineScaleModifier) {
-			scale = 0.01;
-		} else {
-			scale = 0.05;
-		}
-	} else {
-		scale = 1;
-	}
 
 	switch (ev->direction) {
 	case GDK_SCROLL_RIGHT:
 	case GDK_SCROLL_UP:
-		adjustment.set_value (adjustment.get_value() + (adjustment.get_page_increment() * scale));
+		adjustment.set_value (adjustment.get_value() + (adjustment.get_step_increment() ));
 		ret = true;
 		break;
 	case GDK_SCROLL_LEFT:
 	case GDK_SCROLL_DOWN:
-		adjustment.set_value (adjustment.get_value() - (adjustment.get_page_increment() * scale));
+		adjustment.set_value (adjustment.get_value() - (adjustment.get_step_increment() ));
 		ret = true;
 		break;
 	default: