more substantive reworkings of TimeAxisView::name_(entry|label) and name editing. better, but i can still (somehow) trigger occasional misbehaviour

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

1 files changed, 35 insertions, 48 deletions

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 958b0b55dd..c366d26640 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -116,8 +116,6 @@ class TimeAxisView : public virtual AxisView
 
 	void idle_resize (uint32_t);
 
-	void hide_name_label ();
-	void hide_name_entry ();
 	void show_name_label ();
 	void show_name_entry ();
 
@@ -200,19 +198,30 @@ class TimeAxisView : public virtual AxisView
 
   protected:
 	/* The Standard LHS Controls */
-	Gtk::HBox             controls_hbox;
-	Gtk::Table            controls_table;
-	Gtk::EventBox         controls_ebox;
-	Gtk::VBox             controls_vbox;
-	Gtk::VBox             time_axis_vbox;
-	Gtk::HBox             name_hbox;
-	Gtk::Frame            name_frame;
- 	Gtkmm2ext::FocusEntry name_entry;
-
-	uint32_t height;  /* in canvas units */
-
-	std::string controls_base_unselected_name;
-	std::string controls_base_selected_name;
+	Gtk::HBox              controls_hbox;
+	Gtk::Table             controls_table;
+	Gtk::EventBox          controls_ebox;
+	Gtk::VBox              controls_vbox;
+	Gtk::VBox              time_axis_vbox;
+	Gtk::HBox              name_hbox;
+ 	Gtkmm2ext::FocusEntry* name_entry;
+	Gtk::Label             name_label;
+        bool                  _name_editing;
+        uint32_t               height;  /* in canvas units */
+	std::string            controls_base_unselected_name;
+	std::string            controls_base_selected_name;
+	Gtk::Menu*             display_menu; /* The standard LHS Track control popup-menus */
+	TimeAxisView*          parent;
+	ArdourCanvas::Group*   selection_group;
+	std::list<GhostRegion*> ghosts;
+	std::list<SelectionRect*> free_selection_rects;
+	std::list<SelectionRect*> used_selection_rects;
+	bool                  _hidden;
+	bool                   in_destructor;
+	Gtk::Menu*            _size_menu;
+	ArdourCanvas::Group*  _canvas_display;
+	double                _y_position;
+	PublicEditor&         _editor;
 
         virtual bool can_edit_name() const;
 
@@ -224,6 +233,9 @@ class TimeAxisView : public virtual AxisView
 	bool name_entry_key_timed_out ();
 	guint32 last_name_entry_key_press_event;
 
+        void begin_name_edit (GdkEvent*);
+        void end_name_edit (bool push_focus);
+
 	/* derived classes can override these */
 
 	virtual void name_entry_changed ();
@@ -255,14 +267,6 @@ class TimeAxisView : public virtual AxisView
 	 */
 	virtual bool handle_display_menu_map_event (GdkEventAny * /*ev*/) { return false; }
 
-	/* The standard LHS Track control popup-menus */
-
-	Gtk::Menu *display_menu;
-
-	Gtk::Label    name_label;
-
-	TimeAxisView* parent;
-
 	Children children;
 	bool is_child (TimeAxisView*);
 
@@ -271,47 +275,30 @@ class TimeAxisView : public virtual AxisView
 
 	/* selection display */
 
-	ArdourCanvas::Group      *selection_group;
-
-	std::list<GhostRegion*> ghosts;
-
-	std::list<SelectionRect*> free_selection_rects;
-	std::list<SelectionRect*> used_selection_rects;
-
 	virtual void selection_click (GdkEventButton*);
 
-	bool _hidden;
-	bool in_destructor;
-	NamePackingBits name_packing;
-
 	void color_handler ();
 
 	void conditionally_add_to_selection ();
 
 	void build_size_menu ();
-	Gtk::Menu* _size_menu;
-
-	ArdourCanvas::Group* _canvas_display;
-	double _y_position;
-	PublicEditor& _editor;
 
 private:
-
 	ArdourCanvas::Group* _canvas_background;
- 	Gtk::VBox* control_parent;
-	int _order;
-	uint32_t _effective_height;
-	double _resize_drag_start;
-	GdkCursor* _preresize_cursor;
-	bool       _have_preresize_cursor;
+ 	Gtk::VBox*            control_parent;
+	int                  _order;
+	uint32_t             _effective_height;
+	double               _resize_drag_start;
+	GdkCursor*           _preresize_cursor;
+	bool                 _have_preresize_cursor;
 	ArdourCanvas::Group* _ghost_group;
+        bool                  _ebox_release_can_act;
 
-	void compute_heights ();
 	static uint32_t button_height;
 	static uint32_t extra_height;
-
 	static int const _max_order;
 	
+	void compute_heights ();
 	bool maybe_set_cursor (int y);
 
 }; /* class TimeAxisView */