diff options
author | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-19 21:40:23 +0000 |
---|---|---|
committer | Paul Davis <paul@linuxaudiosystems.com> | 2010-03-19 21:40:23 +0000 |
commit | 692987ee2e4adf52722bbe47db616af7d9959065 (patch) | |
tree | 12705c7a438b9c80b595bd54076b49966a470532 /libs | |
parent | d1630219500305397e1608e09508872f0ab2f836 (diff) |
shift-click MotionFeedback widgets to reset to default, and monitor section SiP cut now does something (but doesn't pay attention to changes from elsewhere yet
git-svn-id: svn://localhost/ardour2/branches/3.0@6778 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'libs')
-rw-r--r-- | libs/gtkmm2ext/gtkmm2ext/motionfeedback.h | 11 | ||||
-rw-r--r-- | libs/gtkmm2ext/motionfeedback.cc | 7 |
2 files changed, 13 insertions, 5 deletions
diff --git a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h index 23ad122d85..a3a06d39d3 100644 --- a/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h +++ b/libs/gtkmm2ext/gtkmm2ext/motionfeedback.h @@ -84,12 +84,13 @@ class MotionFeedback : public Gtk::VBox Gtk::SpinButton* value; Gtk::Adjustment* adjustment; Glib::RefPtr<Gdk::Pixbuf> pixbuf; - - gfloat step_inc; - gfloat page_inc; + + double default_value; + double step_inc; + double page_inc; bool grab_is_fine; - gdouble grabbed_y; - gdouble grabbed_x; + double grabbed_y; + double grabbed_x; bool i_own_my_adjustment; int subwidth; int subheight; diff --git a/libs/gtkmm2ext/motionfeedback.cc b/libs/gtkmm2ext/motionfeedback.cc index 8cdaac067c..19ce16d815 100644 --- a/libs/gtkmm2ext/motionfeedback.cc +++ b/libs/gtkmm2ext/motionfeedback.cc @@ -54,6 +54,8 @@ MotionFeedback::MotionFeedback (Glib::RefPtr<Gdk::Pixbuf> pix, set_adjustment (adj); } + default_value = adjustment->get_value(); + HBox* hpacker = manage (new HBox); hpacker->pack_start (pixwin, true, false); hpacker->show (); @@ -168,6 +170,11 @@ MotionFeedback::pixwin_button_release_event (GdkEventButton *ev) (GTK_WIDGET(pixwin.gobj())); } } + if (Keyboard::modifier_state_equals (ev->state, Keyboard::TertiaryModifier)) { + /* shift click back to the default */ + adjustment->set_value (default_value); + return true; + } break; case 3: |