From: David Robillard Date: Sat, 14 Mar 2015 01:54:57 +0000 (-0400) Subject: Don't expand track headers to show MIDI stuff. X-Git-Tag: 4.0-rc1~199 X-Git-Url: https://main.carlh.net/gitweb/?a=commitdiff_plain;h=51f4e33dd105ace7035ace239abed78a86919020;p=ardour.git Don't expand track headers to show MIDI stuff. 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. --- diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc index 6987680f26..304593227c 100644 --- a/gtk2_ardour/midi_time_axis.cc +++ b/gtk2_ardour/midi_time_axis.cc @@ -315,14 +315,11 @@ MidiTimeAxisView::set_route (boost::shared_ptr 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 ();