Unify the canvases by moving groups around rather than using set_scrolling_region...

[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 7fa138dc39680715a00bf42e4cfe99f539e35e16..2f014c7a166ecb25d959e5a4c4f771077577f3ad 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -25,6 +25,7 @@
 
 #include <gtkmm/box.h>
 #include <gtkmm/frame.h>
+#include <gtkmm/drawingarea.h>
 #include <gtkmm/eventbox.h>
 #include <gtkmm/table.h>
 #include <gtkmm/entry.h>
@@ -32,6 +33,8 @@
 
 #include <gtkmm2ext/focus_entry.h>
 
+#include <pbd/stateful.h>
+
 #include <ardour/types.h>
 #include <ardour/region.h>
 
@@ -68,7 +71,7 @@ class Selectable;
  * extended to create functional time-axis based views.
  *
  */
-class TimeAxisView : public virtual AxisView
+class TimeAxisView : public virtual AxisView, public Stateful
 {
   private:
        enum NamePackingBits {
@@ -87,18 +90,18 @@ class TimeAxisView : public virtual AxisView
        TimeAxisView(ARDOUR::Session& sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas);
        virtual ~TimeAxisView ();
 
+       XMLNode& get_state (void);
+       int set_state (const XMLNode&);
+
        /* public data: XXX create accessor/mutators for these ?? */
 
        PublicEditor& editor;
        
-       uint32_t height;  /* in canvas units */
        uint32_t effective_height;  /* in canvas units */
-       double   height_scaling_factor; /* used to zoom the track height without changing it */
        double   y_position;
        int      order;
        
-       uint32_t current_height() const { return (uint32_t) floor (height * height_scaling_factor); }
-       void     set_height_scaling_factor (double);
+       uint32_t current_height() const { return height; }
 
        ArdourCanvas::Group   *canvas_display;
        Gtk::VBox       *control_parent;
@@ -110,7 +113,7 @@ class TimeAxisView : public virtual AxisView
        Gtk::Table    controls_table;
        Gtk::EventBox controls_ebox;
        Gtk::VBox     controls_vbox;
-       Gtk::EventBox resizer;
+       Gtk::DrawingArea resizer;
        Gtk::HBox     resizer_box;
        Gtk::HBox     name_hbox;
        Gtk::Frame    name_frame;
@@ -123,8 +126,7 @@ class TimeAxisView : public virtual AxisView
 
        double resize_drag_start;
        int32_t resize_idle_target;
-       int32_t resize_idle_id;
-       bool idle_resize();
+       void idle_resize (uint32_t);
 
        void hide_name_label ();
        void hide_name_entry ();
@@ -221,14 +223,12 @@ class TimeAxisView : public virtual AxisView
        void set_parent (TimeAxisView& p);
        bool has_state () const;
 
-       virtual void set_state (const XMLNode&);
-       virtual XMLNode* get_state_node () { return 0; }
-
        /* call this on the parent */
 
        virtual XMLNode* get_child_xml_node (const string & childname) { return 0; }
 
   protected:
+       uint32_t height;  /* in canvas units */
 
        string controls_base_unselected_name;
        string controls_base_selected_name;