diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-07 17:29:51 +0000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2011-07-07 17:29:51 +0000 |
| commit | 64975776dc34a375b972896776f618752716785c (patch) | |
| tree | 1b3739e22e3b735d2dbb4a437065f87bfcc0f570 | |
| parent | 6a64d4cea78c1db7c35430f945d901f48e65e741 (diff) | |
improve layout of automation track controls box
git-svn-id: svn://localhost/ardour2/branches/3.0@9803 d708f5d6-7413-0410-9779-e7cbd77b26cf
| -rw-r--r-- | gtk2_ardour/automation_time_axis.cc | 16 |
1 files changed, 7 insertions, 9 deletions
diff --git a/gtk2_ardour/automation_time_axis.cc b/gtk2_ardour/automation_time_axis.cc index 8adc1a904e..c00b6fcf44 100644 --- a/gtk2_ardour/automation_time_axis.cc +++ b/gtk2_ardour/automation_time_axis.cc @@ -19,6 +19,7 @@ #include <utility> #include <gtkmm2ext/barcontroller.h> +#include <gtkmm2ext/utils.h> #include "pbd/memento_command.h" #include "pbd/stacktrace.h" @@ -150,21 +151,19 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* rearrange the name display */ + controls_table.remove (name_hbox); + controls_table.attach (name_hbox, 1, 6, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND, 3, 0); + /* we never show these for automation tracks, so make life easier and remove them. */ hide_name_entry(); - /* keep the parameter name short */ - - string shortpname = _name; - int ignore_width; - shortpname = fit_to_pixels (_name, 60, name_font, ignore_width, true); - - name_label.set_text (shortpname); + name_label.set_text (_name); name_label.set_alignment (Gtk::ALIGN_CENTER, Gtk::ALIGN_CENTER); name_label.set_name (X_("TrackParameterName")); + name_label.set_ellipsize (Pango::ELLIPSIZE_END); string tipname = nomparent; if (!tipname.empty()) { @@ -175,8 +174,7 @@ AutomationTimeAxisView::AutomationTimeAxisView ( /* add the buttons */ controls_table.attach (hide_button, 0, 1, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); - - controls_table.attach (auto_button, 5, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); + controls_table.attach (auto_button, 6, 8, 0, 1, Gtk::FILL|Gtk::EXPAND, Gtk::FILL|Gtk::EXPAND); if (_controller) { /* add bar controller */ |