Merge branch 'cairocanvas'

[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 d2bccd4cc39a87ad4220c46ec934b7d868c41f94..682514acfae51cf6b2e76bdc6ac84c226bcda795 100644 (file)
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -24,6 +24,7 @@
 #include <list>
 
 #include <gtkmm/box.h>
+#include <gtkmm/fixed.h>
 #include <gtkmm/frame.h>
 #include <gtkmm/drawingarea.h>
 #include <gtkmm/eventbox.h>
@@ -41,6 +42,8 @@
 #include "ardour/region.h"
 #include "evoral/Parameter.hpp"
 
+#include "canvas/line.h"
+
 #include "prompter.h"
 #include "axis_view.h"
 #include "enums.h"
@@ -201,15 +204,20 @@ class TimeAxisView : public virtual AxisView
 
        protected:
        static Glib::RefPtr<Gtk::SizeGroup> controls_meters_size_group;
+       static Glib::RefPtr<Gtk::SizeGroup> midi_scroomer_size_group;
+       static unsigned int name_width_px;
        /* The Standard LHS Controls */
        Gtk::Table             controls_table;
        Glib::RefPtr<Gtk::SizeGroup> controls_button_size_group;
        Gtk::EventBox          controls_ebox;
        Gtk::VBox              controls_vbox;
+       Gtk::VBox              time_axis_vbox;
+       Gtk::HBox              time_axis_hbox;
        Gtk::Frame             time_axis_frame;
        Gtk::HBox              name_hbox;
        Gtk::HBox              top_hbox;
        Gtk::Label             name_label;
+       Gtk::Fixed             scroomer_placeholder;
        bool                  _name_editing;
        uint32_t               height;  /* in canvas units */
        std::string            controls_base_unselected_name;
@@ -224,6 +232,7 @@ class TimeAxisView : public virtual AxisView
        bool                  _hidden;
        bool                   in_destructor;
        Gtk::Menu*            _size_menu;
+       ArdourCanvas::Line*       _canvas_separator;
        ArdourCanvas::Container*  _canvas_display;
        double                _y_position;
        PublicEditor&         _editor;