make config-window suitable for small[er] screens

[ardour.git] / gtk2_ardour / gain_meter.cc

diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc
index 8fbf2d4252fad83eb8d8d775809e6aed2a4efda7..ae6f03f2109371a5fcf6f5fa7e79845357047f88 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -274,23 +274,22 @@ void
 GainMeterBase::setup_meters (int len)
 {
        int meter_width = 5;
-       if (_width == Wide && _route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
-               meter_width = 10;
-       }
-       level_meter->setup_meters(len, meter_width);
 
        switch (_width) {
-       case Wide:
-               //meter_metric_area.show();
-               meter_ticks1_area.show();
-               meter_ticks2_area.show();
-               break;
-       case Narrow:
-               //meter_metric_area.hide();
-               meter_ticks1_area.hide();
-               meter_ticks2_area.hide();
-               break;
+               case Wide:
+                       meter_ticks1_area.show();
+                       meter_ticks2_area.show();
+                       if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) {
+                               meter_width = 10;
+                       }
+                       break;
+               case Narrow:
+                       meter_width = 2;
+                       meter_ticks1_area.hide();
+                       meter_ticks2_area.hide();
+                       break;
        }
+       level_meter->setup_meters(len, meter_width);
 }
 
 void
@@ -302,6 +301,14 @@ GainMeterBase::set_type (MeterType t)
 void
 GainMeter::setup_meters (int len)
 {
+       switch (_width) {
+               case Wide:
+                       hbox.set_homogeneous(true);
+                       break;
+               case Narrow:
+                       hbox.set_homogeneous(false);
+                       break;
+       }
        GainMeterBase::setup_meters (len);
 }
 
@@ -894,7 +901,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
        gain_display_box.pack_start (gain_display, true, true);
 
        meter_metric_area.set_name ("AudioTrackMetrics");
-       meter_metric_area.set_size_request(25, 10);
+       meter_metric_area.set_size_request(24, -1);
 
        gain_automation_style_button.set_name ("mixer strip button");
        gain_automation_state_button.set_name ("mixer strip button");
@@ -937,7 +944,7 @@ GainMeter::GainMeter (Session* s, int fader_length)
                        sigc::mem_fun(*this, &GainMeter::meter_ticks2_expose));
 
        meter_hbox.pack_start (meter_ticks1_area, false, false);
-       meter_hbox.pack_start (meter_alignment, true, true);
+       meter_hbox.pack_start (meter_alignment, false, false);
        meter_hbox.pack_start (meter_ticks2_area, false, false);
        meter_hbox.pack_start (meter_metric_area, false, false);
 }
@@ -988,8 +995,18 @@ int
 GainMeter::get_gm_width ()
 {
        Gtk::Requisition sz;
-       hbox.size_request (sz);
-       return sz.width;
+       int min_w = 0;
+       meter_metric_area.size_request (sz);
+       min_w += sz.width;
+       level_meter->size_request (sz);
+       min_w += sz.width;
+
+       fader_alignment.size_request (sz);
+       if (_width == Wide)
+               return max(sz.width * 2, min_w * 2) + 6;
+       else
+               return sz.width + min_w + 6;
+
 }
 
 gint