diff options
| author | Carl Hetherington <carl@carlh.net> | 2010-05-11 00:09:41 +0000 |
|---|---|---|
| committer | Carl Hetherington <carl@carlh.net> | 2010-05-11 00:09:41 +0000 |
| commit | 7e6014a07759c93dc3c4f65456eb1fd2b4a7dc3a (patch) | |
| tree | f9f5e7e83646e4676e2fc432a8aadeba5e9fe63a /gtk2_ardour/time_axis_view.h | |
| parent | 37a34bb8b0568ad28fa6c3697a2eab296b0af7ae (diff) | |
Fix track height menu.
git-svn-id: svn://localhost/ardour2/branches/3.0@7093 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.h')
| -rw-r--r-- | gtk2_ardour/time_axis_view.h | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h index d002cc02cf..4e91b15336 100644 --- a/gtk2_ardour/time_axis_view.h +++ b/gtk2_ardour/time_axis_view.h @@ -83,12 +83,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful }; public: - static uint32_t hLargest; - static uint32_t hLarge; - static uint32_t hLarger; - static uint32_t hNormal; - static uint32_t hSmaller; - static uint32_t hSmall; TimeAxisView(ARDOUR::Session* sess, PublicEditor& ed, TimeAxisView* parent, ArdourCanvas::Canvas& canvas); virtual ~TimeAxisView (); @@ -155,6 +149,7 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful virtual void exited () {} virtual void set_height (uint32_t h); + void set_height (Height); void reset_height(); std::pair<TimeAxisView*, ARDOUR::layer_t> covers_y_position (double); @@ -222,6 +217,8 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful typedef std::vector<boost::shared_ptr<TimeAxisView> > Children; SelectionRect* get_selection_rect(uint32_t id); + + static uint32_t preset_height (Height); protected: /* The Standard LHS Controls */ @@ -310,9 +307,6 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful bool in_destructor; NamePackingBits name_packing; - static void compute_controls_size_info (); - static bool need_size_info; - void set_heights (uint32_t h); void color_handler (); @@ -335,6 +329,10 @@ private: double _resize_drag_start; ArdourCanvas::Group* _ghost_group; + void compute_heights (); + static uint32_t extra_height; + static uint32_t smaller_height; + static int const _max_order; }; /* class TimeAxisView */ |