Remove internal edit mode and add "content" tool.

[ardour.git] / gtk2_ardour / time_axis_view_item.h

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 388aa43b7ab3936b3314ba1480f17c979e9799fd..74a655a6c0e14e33c1dab7d165123998b316625f 100644 (file)
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -33,7 +33,7 @@ namespace ArdourCanvas {
        class Pixbuf;
        class Rectangle;
        class Item;
-        class Layout;
+        class Container;
        class Text;
 }
 
@@ -76,7 +76,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        void set_color (uint32_t);
        void set_name_text_color ();
 
-        uint32_t get_fill_color () const;
+       uint32_t get_fill_color () const;
 
        ArdourCanvas::Item* get_canvas_frame();
        ArdourCanvas::Item* get_canvas_group();
@@ -116,20 +116,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        static double NAME_HIGHLIGHT_SIZE;
        static double NAME_HIGHLIGHT_THRESH;
 
-        /* if this is 1.0, we move the right boundary
-          of the item frame so that it is 1 pixel
-          after the end of the item. This gives nice
-          effects when splitting items.
-          
-          if this is zero, the right edge coincides
-          with the end of the item, and things don't
-          look so nice. 
-          
-          this exists to allow easy debugging of the
-          two scenarios.
-       */
-       static const double RIGHT_EDGE_SHIFT;
-
        /**
         * Emitted when this Group has been removed.
         * This is different to the CatchDeletion signal in that this signal
@@ -240,9 +226,10 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
        bool high_enough_for_name;
         bool rect_visible;
 
-       ArdourCanvas::Layout*      group;
+       ArdourCanvas::Container*      group;
        ArdourCanvas::Rectangle* vestigial_frame;
        ArdourCanvas::Rectangle* frame;
+       ArdourCanvas::Rectangle* selection_frame;
        ArdourCanvas::Text*      name_text;
        ArdourCanvas::Rectangle* name_highlight;
 
@@ -254,6 +241,7 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 
        double _height;
        Visibility visibility;
+       std::string _fill_color_name;
        bool _recregion;
        bool _automation; ///< true if this is an automation region view
        bool _dragging;