diff options
author | David Robillard <d@drobilla.net> | 2014-12-08 23:00:00 -0500 |
---|---|---|
committer | David Robillard <d@drobilla.net> | 2014-12-18 20:21:01 -0500 |
commit | 5fef65538040fbac1b9edd1847a269aa925a49c9 (patch) | |
tree | 398d11d0f563c74ba15fbee3463378b4456d1d94 /gtk2_ardour/audio_region_view.cc | |
parent | 1b89055526df4d995530c0f3debebc480c33fc41 (diff) |
Remove internal edit mode and add "content" tool.
Diffstat (limited to 'gtk2_ardour/audio_region_view.cc')
-rw-r--r-- | gtk2_ardour/audio_region_view.cc | 21 |
1 files changed, 9 insertions, 12 deletions
diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc index d5882514c7..70bcca0dcd 100644 --- a/gtk2_ardour/audio_region_view.cc +++ b/gtk2_ardour/audio_region_view.cc @@ -568,7 +568,7 @@ AudioRegionView::reset_fade_in_shape_width (boost::shared_ptr<AudioRegion> ar, f if (fade_in_handle->visible()) { //see comment for drag_start - entered(false); + entered(); } if (pwidth < 5) { @@ -653,7 +653,7 @@ AudioRegionView::reset_fade_out_shape_width (boost::shared_ptr<AudioRegion> ar, if (fade_out_handle->visible()) { //see comment for drag_start - entered(false); + entered(); } /* don't show shape if its too small */ @@ -1051,9 +1051,9 @@ AudioRegionView::update_envelope_visibility () } if (Config->get_show_region_gain() || trackview.editor().current_mouse_mode() == Editing::MouseDraw || trackview.editor().current_mouse_mode() == Editing::MouseRange ) { - gain_line->add_visibility (AutomationLine::Line); + gain_line->set_visibility (AutomationLine::VisibleAspects(AutomationLine::ControlPoints|AutomationLine::Line)); } else { - gain_line->hide (); + gain_line->set_visibility (AutomationLine::VisibleAspects(0)); } } @@ -1298,17 +1298,14 @@ AudioRegionView::add_ghost (TimeAxisView& tv) } void -AudioRegionView::entered (bool internal_editing) +AudioRegionView::entered () { trackview.editor().set_current_trimmable (_region); trackview.editor().set_current_movable (_region); - - if (gain_line) { - /* these may or may not be visible depending on mouse mode */ - gain_line->add_visibility (AutomationLine::ControlPoints); - } - if (!internal_editing && ( trackview.editor().current_mouse_mode() == Editing::MouseObject ) ) { + update_envelope_visibility(); + + if ((trackview.editor().current_mouse_mode() == Editing::MouseObject)) { if (start_xfade_rect) { start_xfade_rect->set_outline (true); } @@ -1614,7 +1611,7 @@ AudioRegionView::drag_end () // if fade_in_trim_handle or fade_out_trim_handle should // be visible. -- If the fade_in_handle is visible // we have focus and are not in internal edit mode. - entered(false); + entered(); } } |