Don't expand track headers to show MIDI stuff.
authorDavid Robillard <d@drobilla.net>
Sat, 14 Mar 2015 01:54:57 +0000 (21:54 -0400)
committerDavid Robillard <d@drobilla.net>
Sat, 14 Mar 2015 02:09:13 +0000 (22:09 -0400)
Fixes bug #0006138.  This solution does make the other label move when settings
are changed (presumably what the fixed width stuff was for), but I don't think
this is a big deal.  Lesser of two evils, at least.

gtk2_ardour/midi_time_axis.cc

index 6987680f262263c1e0fad3808db79bb8c5c5e4c5..304593227cc6de9aa5ff23cebaab3cbdeab7828f 100644 (file)
@@ -315,14 +315,11 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
        channel_selector_button->set_name ("route button");
        ARDOUR_UI::instance()->set_tip (channel_selector_button, _("Click to edit channel settings"));
        
-       /* fixed sized labels to prevent silly nonsense (though obviously,
-        * they cause their own too)
-        */
-       set_size_request_to_display_given_text(_playback_channel_status, "Play: somemo", 2, 2); // TODO use _("Play: all/some")
-       set_size_request_to_display_given_text(_capture_channel_status, "Rec: somemo", 2, 2); // TODO use _("Rec: all/some")
-
-       _channel_status_box.pack_start (_playback_channel_status, false, false);
-       _channel_status_box.pack_start (_capture_channel_status, false, false);
+       // Insert expanding space labels to get full width justification
+       _channel_status_box.pack_start (_playback_channel_status, false, false, 2);
+       _channel_status_box.pack_start (*Gtk::manage(new Gtk::Label(" ")), true, true);
+       _channel_status_box.pack_start (_capture_channel_status, false, false, 2);
+       _channel_status_box.pack_start (*Gtk::manage(new Gtk::Label(" ")), true, true);
        _channel_status_box.pack_end (*channel_selector_button, false, false);
        _channel_status_box.show_all ();