move midi scroomer to right of meter and fix alignment

[ardour.git] / gtk2_ardour / midi_time_axis.cc

diff --git a/gtk2_ardour/midi_time_axis.cc b/gtk2_ardour/midi_time_axis.cc
index a8faaf7ed47c31c335bfb44f991d1d340c9e7df4..685f4693583ce74665ee653bb25f274aa93ab1b0 100644 (file)
--- a/gtk2_ardour/midi_time_axis.cc
+++ b/gtk2_ardour/midi_time_axis.cc
@@ -50,6 +50,7 @@
 #include "ardour/panner.h"
 #include "ardour/panner_shell.h"
 #include "ardour/playlist.h"
+#include "ardour/profile.h"
 #include "ardour/region.h"
 #include "ardour/region_factory.h"
 #include "ardour/route.h"
@@ -98,7 +99,7 @@ using namespace Gtkmm2ext;
 using namespace Editing;
 
 // Minimum height at which a control is displayed
-static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 140;
+static const uint32_t MIDI_CONTROLS_BOX_MIN_HEIGHT = 160;
 static const uint32_t KEYBOARD_MIN_HEIGHT = 130;
 
 MidiTimeAxisView::MidiTimeAxisView (PublicEditor& ed, Session* sess, ArdourCanvas::Canvas& canvas)
@@ -209,15 +210,26 @@ MidiTimeAxisView::set_route (boost::shared_ptr<Route> rt)
                   label so that they can be reduced in height for stacked-view
                   tracks.
                */
+
+               top_hbox.remove(gm.get_level_meter());
                VBox* v = manage (new VBox);
                HBox* h = manage (new HBox);
-               h->pack_start (*_range_scroomer);
-               h->pack_start (*_piano_roll_header);
+               h->pack_end (*_piano_roll_header);
+               h->pack_end (*_range_scroomer);
+               h->pack_end (gm.get_level_meter(), false, false, 4);
                v->pack_start (*h, false, false);
-               v->pack_start (*manage (new Label ("")), true, true);
                v->show ();
                h->show ();
-               controls_hbox.pack_start(*v, false, false);
+               top_hbox.pack_end(*v, false, false, 0);
+               if (!ARDOUR::Profile->get_mixbus()) {
+                       controls_meters_size_group->remove_widget (gm.get_level_meter());
+                       controls_meters_size_group->add_widget (*h);
+               }
+               // make up for level_meter 4 spc padding in RTA
+               Gtk::Fixed *blank = manage(new Gtk::Fixed());
+               blank->set_size_request(8, -1);
+               blank->show();
+               top_hbox.pack_end(*blank, false, false, 0);
 
                controls_ebox.set_name ("MidiTrackControlsBaseUnselected");
                controls_base_selected_name = "MidiTrackControlsBaseSelected";