Don't tempt the user with visual cues that they can adjust fades when they can't...

git-svn-id: svn://localhost/ardour2/branches/3.0@7433 d708f5d6-7413-0410-9779-e7cbd77b26cf

diff --git a/gtk2_ardour/audio_region_view.cc b/gtk2_ardour/audio_region_view.cc
index 06621a20e2caae0e097890fa0ac01d459893e69f..452c17aad31f4f1ccd5f9243e494312233c48d47 100644 (file)
--- a/gtk2_ardour/audio_region_view.cc
+++ b/gtk2_ardour/audio_region_view.cc
@@ -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);
        }
@@ -1484,4 +1484,4 @@ AudioRegionView::remove_transient(float pos)
                    break;
                }
        }
-}
\ No newline at end of file
+}

diff --git a/gtk2_ardour/audio_region_view.h b/gtk2_ardour/audio_region_view.h
index 0e2b54130c10c2cb1eaf3ee7ee74c0f46271c2c4..270f9821463c5d6330552a69df60e0861507caab 100644 (file)
--- a/gtk2_ardour/audio_region_view.h
+++ b/gtk2_ardour/audio_region_view.h
@@ -111,7 +111,7 @@ class AudioRegionView : public RegionView
 
        void show_region_editor ();
 
-       virtual void entered ();
+       virtual void entered (bool);
        virtual void exited ();
 
   protected:

diff --git a/gtk2_ardour/automation_region_view.cc b/gtk2_ardour/automation_region_view.cc
index feb40c3ddf570a9ac1b965bbd5fb9f73df28edb4..d403f0e90e0330cbe9249c870fd0e6bd577bc2a7 100644 (file)
--- a/gtk2_ardour/automation_region_view.cc
+++ b/gtk2_ardour/automation_region_view.cc
@@ -186,7 +186,7 @@ AutomationRegionView::region_resized (const PBD::PropertyChange& what_changed)
 
 
 void
-AutomationRegionView::entered()
+AutomationRegionView::entered (bool)
 {
        if (_line)
                _line->track_entered();

diff --git a/gtk2_ardour/automation_region_view.h b/gtk2_ardour/automation_region_view.h
index 691e2cd0509f1d13cdd5655c40fb18b992954fe8..9654d6afa1afdf4ed913e08bb8b866a4546d3661 100644 (file)
--- a/gtk2_ardour/automation_region_view.h
+++ b/gtk2_ardour/automation_region_view.h
@@ -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:

diff --git a/gtk2_ardour/editor.cc b/gtk2_ardour/editor.cc
index 23a9a787a49fab551ecdf22e3c43757d8f659b5d..4d1554d7d28812e3beb8f0911a04d47bfa5b66a3 100644 (file)
--- a/gtk2_ardour/editor.cc
+++ b/gtk2_ardour/editor.cc
@@ -797,7 +797,7 @@ Editor::set_entered_regionview (RegionView* rv)
        }
 
        if ((entered_regionview = rv) != 0) {
-               entered_regionview->entered ();
+               entered_regionview->entered (internal_editing ());
        }
 }
 

diff --git a/gtk2_ardour/editor_mouse.cc b/gtk2_ardour/editor_mouse.cc
index 378a8ecf3221662184187bd3210a6b49a063d11f..1acfef641184e3e244112b66d12d4ff0ec527d3e 100644 (file)
--- a/gtk2_ardour/editor_mouse.cc
+++ b/gtk2_ardour/editor_mouse.cc
@@ -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;

diff --git a/gtk2_ardour/region_view.h b/gtk2_ardour/region_view.h
index 29a19260cb79c50f1c0112e1da6fcacb881b61f0..5421d7d6134d376630aeec47c7b7d95316461f00 100644 (file)
--- a/gtk2_ardour/region_view.h
+++ b/gtk2_ardour/region_view.h
@@ -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; }