summaryrefslogtreecommitdiff
path: root/gtk2_ardour/time_axis_view.h
diff options
context:
space:
mode:
authorDavid Robillard <d@drobilla.net>2011-06-02 00:06:35 +0000
committerDavid Robillard <d@drobilla.net>2011-06-02 00:06:35 +0000
commitb27a3d99ac608ce9242261fecf5840dc1eb560e8 (patch)
tree527939f379aa660e5782357c2cc8345f9e00b997 /gtk2_ardour/time_axis_view.h
parentba5b31dfdf203939136f776275973b5263e0f250 (diff)
Remove "smaller" track height (basically just a broken version of small anyway).
Remove no-longer-necessary cruft related to non-editable track names (which do not exist). Fix smallest height to be correctly padded (just large enough to hold the button row without ugly clipping). Fix resizing of tracks when renaming (issue #4075). git-svn-id: svn://localhost/ardour2/branches/3.0@9665 d708f5d6-7413-0410-9779-e7cbd77b26cf
Diffstat (limited to 'gtk2_ardour/time_axis_view.h')
-rw-r--r--gtk2_ardour/time_axis_view.h21
1 files changed, 10 insertions, 11 deletions
diff --git a/gtk2_ardour/time_axis_view.h b/gtk2_ardour/time_axis_view.h
index f9745e8456..fde5bf0b34 100644
--- a/gtk2_ardour/time_axis_view.h
+++ b/gtk2_ardour/time_axis_view.h
@@ -217,16 +217,15 @@ class TimeAxisView : public virtual AxisView, public PBD::Stateful
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::DrawingArea resizer;
+ Gtk::HBox resizer_box;
+ Gtk::HBox name_hbox;
+ Gtk::Frame name_frame;
Gtkmm2ext::FocusEntry name_entry;
uint32_t height; /* in canvas units */
@@ -326,7 +325,7 @@ private:
void compute_heights ();
static uint32_t extra_height;
- static uint32_t smaller_height;
+ static uint32_t small_height;
static int const _max_order;