Tidy a couple of minor things up.

[ardour.git] / gtk2_ardour / time_axis_view.h

diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index 92835fb59e2ed611350e5b552da73e41f834e5d0..790274c6265627fbac93b267654409d16556b8a7 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -74,7 +74,7 @@ class StreamView;
  * This class provides the basic LHS controls and display methods. This should be
  * extended to create functional time-axis based views.
  */
-class TimeAxisView : public virtual AxisView, public PBD::Stateful
+class TimeAxisView : public virtual AxisView
 {
   private:
        enum NamePackingBits {
@@ -87,9 +87,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
        virtual ~TimeAxisView ();
 
-       XMLNode& get_state ();
-       int set_state (const XMLNode&, int version);
-
        static PBD::Signal1<void,TimeAxisView*> CatchDeletion;
 
        /** @return index of this TimeAxisView within its parent */
@@ -117,11 +114,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        uint32_t current_height() const { return height; }
 
-       bool resizer_button_press (GdkEventButton*);
-       bool resizer_button_release (GdkEventButton*);
-       bool resizer_motion (GdkEventMotion*);
-       bool resizer_expose (GdkEventExpose*);
-
        void idle_resize (uint32_t);
 
        void hide_name_label ();
@@ -129,20 +121,17 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        void show_name_label ();
        void show_name_entry ();
 
-       virtual bool set_visibility (bool);
        virtual guint32 show_at (double y, int& nth, Gtk::VBox *parent);
+       virtual void hide ();
 
        void clip_to_viewport ();
 
        bool touched (double top, double bot);
 
-       /** Hide this TrackView */
-       virtual void hide ();
-
        /** @return true if hidden, otherwise false */
        bool hidden () const { return _hidden; }
 
-       virtual void set_selected (bool);
+       void set_selected (bool);
 
        /**
         * potential handler for entered events
@@ -155,6 +144,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        void set_height_enum (Height, bool apply_to_selection = false);
        void reset_height();
 
+       virtual void reset_visual_state ();
+
        std::pair<TimeAxisView*, ARDOUR::layer_t> covers_y_position (double);
 
        virtual void step_height (bool);
@@ -199,11 +190,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        TimeAxisView* get_parent () { return parent; }
        void set_parent (TimeAxisView& p);
-       bool has_state () const;
-
-       /* call this on the parent */
-
-       virtual XMLNode* get_automation_child_xml_node (Evoral::Parameter) { return 0; }
 
        virtual LayerDisplay layer_display () const { return Overlaid; }
        virtual StreamView* view () const { return 0; }
@@ -212,21 +198,18 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
        Children get_child_list ();
 
        SelectionRect* get_selection_rect(uint32_t id);
-
-       static uint32_t preset_height (Height);
        
+       static uint32_t preset_height (Height);
+
   protected:
        /* The Standard LHS Controls */
-       Gtk::HBox     controls_hbox;
-       Gtk::Table    controls_table;
-       Gtk::Table   _controls_padding_table;
-       Gtk::EventBox controls_ebox;
-       Gtk::VBox     controls_vbox;
-       Gtk::VBox     time_axis_vbox;
-       Gtk::DrawingArea resizer;
-       Gtk::HBox     resizer_box;
-       Gtk::HBox     name_hbox;
-       Gtk::Frame    name_frame;
+       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 */
@@ -252,8 +235,11 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
         *
         *@ param ev the event
         */
-       virtual bool controls_ebox_button_release (GdkEventButton *ev);
-       virtual bool controls_ebox_scroll (GdkEventScroll *ev);
+       virtual bool controls_ebox_button_release (GdkEventButton*);
+       virtual bool controls_ebox_scroll (GdkEventScroll*);
+       virtual bool controls_ebox_button_press (GdkEventButton*);
+       virtual bool controls_ebox_motion (GdkEventMotion*);
+       virtual bool controls_ebox_leave (GdkEventCrossing*);
 
        /** Display the standard LHS control menu at when.
         *
@@ -278,9 +264,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
 
        TimeAxisView* parent;
 
-       /** Find the parent with state */
-       TimeAxisView* get_parent_with_state();
-
        Children children;
        bool is_child (TimeAxisView*);
 
@@ -322,13 +305,17 @@ private:
        int _order;
        uint32_t _effective_height;
        double _resize_drag_start;
+       GdkCursor* _preresize_cursor;
+       bool       _have_preresize_cursor;
        ArdourCanvas::Group* _ghost_group;
 
        void compute_heights ();
+       static uint32_t button_height;
        static uint32_t extra_height;
-       static uint32_t smaller_height;
 
        static int const _max_order;
+       
+       bool maybe_set_cursor (int y);
 
 }; /* class TimeAxisView */