diff options
| author | Robin Gareus <robin@gareus.org> | 2017-11-03 15:55:33 +0100 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2017-11-03 15:55:33 +0100 |
| commit | caedbbf543241cf1f48242a95b76cd19415f3389 (patch) | |
| tree | 54612ec46666dd638ecec84708336183dc8d57ea /gtk2_ardour/gain_meter.cc | |
| parent | edff34a59b2bbe0b61d3be309450aef58299049c (diff) | |
Fix scroll-wheel on mixer-sliders
74c986534b changes the semantics of fader-flags:
NoVerticalScroll was "ignore vertical scroll for horizontal faders".
Now the flag ignores all vertical scrolling.
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index edb1217911..41323acf19 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -113,8 +113,10 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int if (horizontal) { gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth)); + gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll)); } else { gain_slider = manage (new VSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth)); + gain_slider->set_tweaks (ArdourFader::NoButtonForward); } level_meter = new LevelMeterHBox(_session); @@ -123,7 +125,6 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int meter_metric_area.signal_button_press_event().connect (sigc::mem_fun (*this, &GainMeterBase::level_meter_button_press)); meter_metric_area.add_events (Gdk::BUTTON_PRESS_MASK); - gain_slider->set_tweaks (ArdourFader::Tweaks(ArdourFader::NoButtonForward | ArdourFader::NoVerticalScroll)); gain_slider->StartGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_start_touch)); gain_slider->StopGesture.connect (sigc::mem_fun (*this, &GainMeter::amp_stop_touch)); gain_slider->set_name ("GainFader"); |