X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=gtk2_ardour%2Ftime_axis_view_item.h;h=af08d9da331c9e1e340b612ab921a4c0a2eec31d;hb=8505c16057a074531a99728e730408151d7aafa4;hp=9e8651fa39fde1b9eef7d18fd39d3fc346b8cc1e;hpb=65ef1a8b8a6a1056d770470d0a486f6a41eb58a0;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 9e8651fa39..af08d9da33 100644
--- a/gtk2_ardour/time_axis_view_item.h
+++ b/gtk2_ardour/time_axis_view_item.h
@@ -33,8 +33,8 @@ namespace ArdourCanvas {
 	class Pixbuf;
 	class Rectangle;
 	class Item;
-	class Group;
-	class Text;
+        class Container;
+ 	class Text;
 }
 
 using ARDOUR::framepos_t;
@@ -71,23 +71,23 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	TimeAxisView& get_time_axis_view () const;
 	void set_name_text(const std::string&);
 	virtual void set_height(double h);
+	virtual double height() const { return _height; }
 	void set_y (double);
 	void set_color (uint32_t);
 	void set_name_text_color ();
-	void set_opacity_for_drag (bool drag_starting);
 
-        uint32_t get_fill_color () const;
+	virtual uint32_t get_fill_color () const;
 
 	ArdourCanvas::Item* get_canvas_frame();
-	ArdourCanvas::Group* get_canvas_group();
+	ArdourCanvas::Item* get_canvas_group();
 	ArdourCanvas::Item* get_name_highlight();
 
 	virtual void set_samples_per_pixel (double);
 
 	double get_samples_per_pixel () const;
 
-	virtual void drag_start() { _dragging = true; }
-	virtual void drag_end() { _dragging = false; }
+	virtual void drag_start();
+	virtual void drag_end();
 	bool dragging() const { return _dragging; }
 
 	virtual void raise () { return; }
@@ -95,9 +95,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	virtual void lower () { return; }
 	virtual void lower_to_bottom () { return; }
 
-        virtual void hide_rect ();
-        virtual void show_rect ();
-
 	/** @return true if the name area should respond to events */
 	bool name_active() const { return name_connected; }
 
@@ -116,20 +113,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
@@ -170,12 +153,12 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	};
 
   protected:
-	TimeAxisViewItem (const std::string &, ArdourCanvas::Group&, TimeAxisView&, double, uint32_t fill_color,
+	TimeAxisViewItem (const std::string &, ArdourCanvas::Item&, TimeAxisView&, double, uint32_t fill_color,
 			  framepos_t, framecnt_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
 
 	TimeAxisViewItem (const TimeAxisViewItem&);
 
-        void init (ArdourCanvas::Group*, double, uint32_t, framepos_t, framepos_t, Visibility, bool, bool);
+        void init (ArdourCanvas::Item*, double, uint32_t, framepos_t, framepos_t, Visibility, bool, bool);
 
         virtual bool canvas_group_event (GdkEvent*);
 
@@ -230,19 +213,17 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	/** true if a small vestigial rect should be shown when the item gets very narrow */
 	bool show_vestigial;
 
-	uint32_t fill_opacity;
 	uint32_t fill_color;
-	uint32_t pre_drag_fill_color;
 
 	uint32_t last_item_width;
 	int name_text_width;
 	bool wide_enough_for_name;
 	bool high_enough_for_name;
-        bool rect_visible;
 
-	ArdourCanvas::Group*      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 +235,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;