diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2015-05-26 16:41:03 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2015-05-26 16:41:03 -0500 |
| commit | cc7a368fb6d330f431de00fc2e5840708e0398bb (patch) | |
| tree | 2ff5aa27c6613ba3c915a70c071972995761be01 /gtk2_ardour/audio_region_view.cc | |
| parent | d3df99e22ed9ca96e3c9fb2e4c206677d79cac48 (diff) | |
Rationalize some aspects of region-gain control-point visibility:
Visibility is driven by the currently selected mouse mode.
Visibility no longer depends on entering/exiting the region.
Range mode shows the lines but not the points.
Fixed option text to reflect new operation.
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
| -rw-r--r-- | gtk2_ardour/audio_region_view.cc | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index 9cbc3aad79..6934bdb2ad 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -1049,10 +1049,12 @@ AudioRegionView::update_envelope_visibility () return; } - if (ARDOUR_UI::config()->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) { + if (ARDOUR_UI::config()->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseContent ) { gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::ControlPoints|AutomationLine::Line)); gain_line->canvas_group().raise_to_top (); - + } else if (trackview.editor().current_mouse_mode() == Editing::MouseRange ) { + gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::Line)); + gain_line->canvas_group().raise_to_top (); } else { gain_line->set_visibility (AutomationLine::VisibleAspects(0)); } @@ -1349,9 +1351,9 @@ AudioRegionView::exited () trackview.editor().set_current_trimmable (boost::shared_ptr<Trimmable>()); trackview.editor().set_current_movable (boost::shared_ptr<Movable>()); - if (gain_line) { - gain_line->remove_visibility (AutomationLine::ControlPoints); - } +// if (gain_line) { +// gain_line->remove_visibility (AutomationLine::ControlPoints); +// } if (fade_in_handle) { fade_in_handle->hide(); } if (fade_out_handle) { fade_out_handle->hide(); } |