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 82365f03a4c53e137683b1b045955d4af98997d6..ae6f03f2109371a5fcf6f5fa7e79845357047f88 100644 (file)
--- a/gtk2_ardour/gain_meter.cc
+++ b/gtk2_ardour/gain_meter.cc
@@ -301,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);
 }
 
@@ -987,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