Don't tempt the user with visual cues that they can adjust fades when they can't (in MIDI internal edit mode)
git-svn-id: svn://localhost/ardour2/branches/3.0@7433 d708f5d6-7413-0410-9779-e7cbd77b26cf
This commit is contained in:
parent
da67628bcf
commit
27dd925f42
@ -1229,7 +1229,7 @@ AudioRegionView::add_ghost (TimeAxisView& tv)
|
||||
}
|
||||
|
||||
void
|
||||
AudioRegionView::entered ()
|
||||
AudioRegionView::entered (bool internal_editing)
|
||||
{
|
||||
if (gain_line && _flags & EnvelopeVisible) {
|
||||
gain_line->show_all_control_points ();
|
||||
@ -1239,7 +1239,7 @@ AudioRegionView::entered ()
|
||||
UINT_TO_RGBA(fade_color,&r,&g,&b,&a);
|
||||
a=255;
|
||||
|
||||
if (fade_in_handle) {
|
||||
if (fade_in_handle && !internal_editing) {
|
||||
fade_in_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,a);
|
||||
fade_out_handle->property_fill_color_rgba() = RGBA_TO_UINT(r,g,b,a);
|
||||
}
|
||||
|
@ -111,7 +111,7 @@ class AudioRegionView : public RegionView
|
||||
|
||||
void show_region_editor ();
|
||||
|
||||
virtual void entered ();
|
||||
virtual void entered (bool);
|
||||
virtual void exited ();
|
||||
|
||||
protected:
|
||||
|
@ -186,7 +186,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
|
||||
|
||||
|
||||
void
|
||||
AutomationRegionView::entered()
|
||||
AutomationRegionView::entered (bool)
|
||||
{
|
||||
if (_line)
|
||||
_line->track_entered();
|
||||
|
@ -68,7 +68,7 @@ protected:
|
||||
void region_resized (const PBD::PropertyChange&);
|
||||
bool canvas_event(GdkEvent* ev);
|
||||
void add_automation_event (GdkEvent* event, nframes_t when, double y);
|
||||
void entered();
|
||||
void entered (bool);
|
||||
void exited();
|
||||
|
||||
private:
|
||||
|
@ -797,7 +797,7 @@ Editor::set_entered_regionview (RegionView* rv)
|
||||
}
|
||||
|
||||
if ((entered_regionview = rv) != 0) {
|
||||
entered_regionview->entered ();
|
||||
entered_regionview->entered (internal_editing ());
|
||||
}
|
||||
}
|
||||
|
||||
|
@ -1612,7 +1612,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
|
||||
break;
|
||||
|
||||
case FadeInHandleItem:
|
||||
if (mouse_mode == MouseObject) {
|
||||
if (mouse_mode == MouseObject && !internal_editing()) {
|
||||
ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
|
||||
if (rect) {
|
||||
rect->property_fill_color_rgba() = 0;
|
||||
@ -1623,7 +1623,7 @@ Editor::enter_handler (ArdourCanvas::Item* item, GdkEvent* event, ItemType item_
|
||||
break;
|
||||
|
||||
case FadeOutHandleItem:
|
||||
if (mouse_mode == MouseObject) {
|
||||
if (mouse_mode == MouseObject && !internal_editing()) {
|
||||
ArdourCanvas::SimpleRect *rect = dynamic_cast<ArdourCanvas::SimpleRect *> (item);
|
||||
if (rect) {
|
||||
rect->property_fill_color_rgba() = 0;
|
||||
|
@ -83,7 +83,7 @@ class RegionView : public TimeAxisViewItem
|
||||
|
||||
uint32_t get_fill_color ();
|
||||
|
||||
virtual void entered () {}
|
||||
virtual void entered (bool) {}
|
||||
virtual void exited () {}
|
||||
|
||||
virtual void enable_display(bool yn) { _enable_display = yn; }
|
||||
|
Loading…
Reference in New Issue
Block a user