X-Git-Url: https://main.carlh.net/gitweb/?a=blobdiff_plain;f=gtk2_ardour%2Ftime_axis_view_item.h;h=49cd615d6aacdc2fcd59cb34fc9ee76614f9695b;hb=13d44c4d7627e32a9c98645ab5a95daa6abc8cca;hp=9229a3c791df708732b04562905c78636da7e44b;hpb=60313085209a6213a7388e0b1070c10e83fe2a10;p=ardour.git

diff --git a/gtk2_ardour/time_axis_view_item.h b/gtk2_ardour/time_axis_view_item.h
index 9229a3c791..49cd615d6a 100644
--- 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 Container;
+	class Container;
  	class Text;
 }
 
@@ -46,7 +46,7 @@ using ARDOUR::framecnt_t;
 
 class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 {
-   public:
+public:
 	virtual ~TimeAxisViewItem();
 
 	virtual bool set_position(framepos_t, void*, double* delta = 0);
@@ -106,8 +106,8 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	static const double GRAB_HANDLE_WIDTH;
 
 	/* these are not constant, but vary with the pixel size
-	   of the font used to display the item name.
-	*/
+	 * of the font used to display the item name.
+	 */
 	static int    NAME_HEIGHT;
 	static double NAME_Y_OFFSET;
 	static double NAME_HIGHLIGHT_SIZE;
@@ -152,15 +152,15 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 		FullWidthNameHighlight = 0x80
 	};
 
-  protected:
+protected:
 	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));
+	                  framepos_t, framecnt_t, bool recording = false, bool automation = false, Visibility v = Visibility (0));
 
 	TimeAxisViewItem (const TimeAxisViewItem&);
 
-        void init (ArdourCanvas::Item*, 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*);
+	virtual bool canvas_group_event (GdkEvent*);
 
 	virtual void set_colors();
 	virtual void set_frame_color();
@@ -210,9 +210,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	/** true if the name should respond to events */
 	bool name_connected;
 
-	/** true if a small vestigial rect should be shown when the item gets very narrow */
-	bool show_vestigial;
-
 	uint32_t fill_color;
 
 	uint32_t last_item_width;
@@ -221,7 +218,6 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	bool high_enough_for_name;
 
 	ArdourCanvas::Container*      group;
-	ArdourCanvas::Rectangle* vestigial_frame;
 	ArdourCanvas::Rectangle* frame;
 	ArdourCanvas::Rectangle* selection_frame;
 	ArdourCanvas::Text*      name_text;
@@ -231,21 +227,20 @@ class TimeAxisViewItem : public Selectable, public PBD::ScopedConnectionList
 	ArdourCanvas::Rectangle* frame_handle_start; ///< `frame' (fade) handle for the start of the item, or 0
 	ArdourCanvas::Rectangle* frame_handle_end; ///< `frame' (fade) handle for the end of the item, or 0
 
-        bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*);
+	bool frame_handle_crossing (GdkEvent*, ArdourCanvas::Rectangle*);
 
 	double _height;
 	Visibility visibility;
-	std::string _fill_color_name;
+	std::string fill_color_name;
 	bool _recregion;
 	bool _automation; ///< true if this is an automation region view
 	bool _dragging;
+	double _width;
 
 private:
-        double _width;
-
 	void parameter_changed (std::string);
-        void manage_name_highlight ();
-        void manage_name_text ();
+	void manage_name_highlight ();
+	void manage_name_text ();
 
 }; /* class TimeAxisViewItem */