diff options
author | Carl Hetherington <carl@carlh.net> | 2012-06-19 13:07:02 +0000 |
---|---|---|
committer | Carl Hetherington <carl@carlh.net> | 2012-06-19 13:07:02 +0000 |
commit | b2ad7c087b35c1ca58ce95be82c3100d23adb545 (patch) | |
tree | ca311c2621bfb251d773656495f67a40f7f65366 | |
parent | 6b9d82be5c210061dca338297d7cdd30420a1638 (diff) |
Use set_editable() rather than set_sensitive() to lock the clocks of locked markers, so that middle-click to locate to the marker still works even when locked (#4939).
git-svn-id: svn://localhost/ardour2/branches/3.0@12777 d708f5d6-7413-0410-9779-e7cbd77b26cf
-rw-r--r-- | gtk2_ardour/location_ui.cc | 14 | ||||
-rw-r--r-- | gtk2_ardour/location_ui.h | 2 |
2 files changed, 8 insertions, 8 deletions
diff --git a/gtk2_ardour/location_ui.cc b/gtk2_ardour/location_ui.cc index ea6a3f544c..9f027ea8bf 100644 --- a/gtk2_ardour/location_ui.cc +++ b/gtk2_ardour/location_ui.cc @@ -322,7 +322,7 @@ LocationEditRow::set_location (Location *loc) length_clock.hide(); } - set_clock_sensitivity (); + set_clock_editable_status (); --i_am_the_modifier; @@ -632,7 +632,7 @@ LocationEditRow::location_changed (ARDOUR::Location*) end_clock.set (location->end()); length_clock.set (location->length()); - set_clock_sensitivity (); + set_clock_editable_status (); i_am_the_modifier--; @@ -665,7 +665,7 @@ LocationEditRow::lock_changed (ARDOUR::Location*) lock_check_button.set_active (location->locked()); - set_clock_sensitivity (); + set_clock_editable_status (); i_am_the_modifier--; } @@ -691,11 +691,11 @@ LocationEditRow::focus_name() } void -LocationEditRow::set_clock_sensitivity () +LocationEditRow::set_clock_editable_status () { - start_clock.set_sensitive (!location->locked()); - end_clock.set_sensitive (!location->locked()); - length_clock.set_sensitive (!location->locked()); + start_clock.set_editable (!location->locked()); + end_clock.set_editable (!location->locked()); + length_clock.set_editable (!location->locked()); } /*------------------------------------------------------------------------*/ diff --git a/gtk2_ardour/location_ui.h b/gtk2_ardour/location_ui.h index b850b89ddd..b01b63e8e4 100644 --- a/gtk2_ardour/location_ui.h +++ b/gtk2_ardour/location_ui.h @@ -139,7 +139,7 @@ class LocationEditRow : public Gtk::HBox, public ARDOUR::SessionHandlePtr void lock_changed (ARDOUR::Location *); void position_lock_style_changed (ARDOUR::Location *); - void set_clock_sensitivity (); + void set_clock_editable_status (); PBD::ScopedConnectionList connections; }; |