diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-13 14:58:23 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-13 14:58:23 +0200 |
| commit | cb9b1801ec4ef5974bc9365c1b551a864615a5cc (patch) | |
| tree | 8659ccdb997d041e1b4568983302689dd4b969f9 | |
| parent | 5bae4373c792481980a1e9a986627f90af4ea520 (diff) | |
ignore mouse-scroll if scroll-bar is not present.
fixes http://tracker.ardour.org/view.php?id=5557
| -rw-r--r-- | gtk2_ardour/meterbridge.cc | 2 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_ui.cc | 2 |
2 files changed, 4 insertions, 0 deletions
diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc index 74c13f45eb..227f533a18 100644 --- a/gtk2_ardour/meterbridge.cc +++ b/gtk2_ardour/meterbridge.cc @@ -309,6 +309,7 @@ Meterbridge::on_scroll_event (GdkEventScroll* ev) void Meterbridge::scroll_left () { + if (!scroller.get_hscrollbar()) return; Adjustment* adj = scroller.get_hscrollbar()->get_adjustment(); /* stupid GTK: can't rely on clamping across versions */ scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment())); @@ -317,6 +318,7 @@ Meterbridge::scroll_left () void Meterbridge::scroll_right () { + if (!scroller.get_hscrollbar()) return; Adjustment* adj = scroller.get_hscrollbar()->get_adjustment(); /* stupid GTK: can't rely on clamping across versions */ scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment())); diff --git a/gtk2_ardour/mixer_ui.cc b/gtk2_ardour/mixer_ui.cc index f206014eea..be43a3d6a0 100644 --- a/gtk2_ardour/mixer_ui.cc +++ b/gtk2_ardour/mixer_ui.cc @@ -1666,6 +1666,7 @@ Mixer_UI::pane_allocation_handler (Allocation&, Gtk::Paned* which) void Mixer_UI::scroll_left () { + if (!scroller.get_hscrollbar()) return; Adjustment* adj = scroller.get_hscrollbar()->get_adjustment(); /* stupid GTK: can't rely on clamping across versions */ scroller.get_hscrollbar()->set_value (max (adj->get_lower(), adj->get_value() - adj->get_step_increment())); @@ -1674,6 +1675,7 @@ Mixer_UI::scroll_left () void Mixer_UI::scroll_right () { + if (!scroller.get_hscrollbar()) return; Adjustment* adj = scroller.get_hscrollbar()->get_adjustment(); /* stupid GTK: can't rely on clamping across versions */ scroller.get_hscrollbar()->set_value (min (adj->get_upper(), adj->get_value() + adj->get_step_increment())); |