diff options
author | Robin Gareus <robin@gareus.org> | 2014-09-06 12:46:03 +0200 |
---|---|---|
committer | Robin Gareus <robin@gareus.org> | 2014-09-06 12:46:03 +0200 |
commit | d63a4edfbf1ae0af78809921832832cca38052f5 (patch) | |
tree | b6a715de244b60aae32f1a00f41aac2e15ca7991 /libs/gtkmm2ext | |
parent | 028346d412207934fa6feb2eee876638e92b9996 (diff) |
pass-though PixFader tweaks API for scroll events
Diffstat (limited to 'libs/gtkmm2ext')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/barcontroller.h | 3 | ||||
-rw-r--r-- | libs/gtkmm2ext/pixfader.cc | 12 |
2 files changed, 12 insertions, 3 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h index 5692406952..9aa1630b02 100644 --- a/libs/gtkmm2ext/gtkmm2ext/barcontroller.h +++ b/libs/gtkmm2ext/gtkmm2ext/barcontroller.h @@ -38,6 +38,9 @@ class LIBGTKMM2EXT_API BarController : public Gtk::Alignment void set_sensitive (bool yn); void set_logarithmic (bool yn) { _logarithmic = yn; } + PixFader::Tweaks tweaks() const { return _slider.tweaks (); } + void set_tweaks (PixFader::Tweaks t) { _slider.set_tweaks (t);} + sigc::signal<void> StartGesture; sigc::signal<void> StopGesture; diff --git a/libs/gtkmm2ext/pixfader.cc b/libs/gtkmm2ext/pixfader.cc index 98ef46a983..9a250efa52 100644 --- a/libs/gtkmm2ext/pixfader.cc +++ b/libs/gtkmm2ext/pixfader.cc @@ -425,7 +425,9 @@ PixFader::on_button_release_event (GdkEventButton* ev) StopGesture (); if (!_hovering) { - Keyboard::magic_widget_drop_focus(); + if (!(_tweaks & NoVerticalScroll)) { + Keyboard::magic_widget_drop_focus(); + } queue_draw (); } @@ -601,7 +603,9 @@ bool PixFader::on_enter_notify_event (GdkEventCrossing*) { _hovering = true; - Keyboard::magic_widget_grab_focus (); + if (!(_tweaks & NoVerticalScroll)) { + Keyboard::magic_widget_grab_focus (); + } queue_draw (); return false; } @@ -611,7 +615,9 @@ PixFader::on_leave_notify_event (GdkEventCrossing*) { if (!_dragging) { _hovering = false; - Keyboard::magic_widget_drop_focus(); + if (!(_tweaks & NoVerticalScroll)) { + Keyboard::magic_widget_drop_focus(); + } queue_draw (); } return false; |