smokephil/ardour
1
0
Fork 0
mirror of https://github.com/Ardour/ardour.git synced 2026-01-20 12:26:07 +01:00
Code Issues Projects Releases Wiki Activity

[Summary] Changed mouse wheel step for mixer strip and inspector faders. Now mouse wheel step equal to 1 pixel.

Browse source 
[Feature reviewed] MKosharnyy AMishyn
[Reviewed] VKamyshniy

===NEEDS PAUL's REVIEW===
This commit is contained in:
Nikolay 2015-02-25 15:14:49 +02:00
parent c8ab3a8465
commit 8d64dd06b6
4 changed files with 6 additions and 20 deletions
Download patch file Download diff file Expand all files Collapse all files

6
gtk2_ardour/gain_meter.cc
View file

@ -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);
}

3
gtk2_ardour/ui/inspector_gain_meter.xml
View file

@ -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">

3
gtk2_ardour/ui/mixer_gain_meter.xml
View file

@ -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"

14
libs/gtkmm2ext/fader.cc
View file

@ -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: