fix meterbridge height issues when config changes

diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc
index d1031545bfa33dcaf4d857e9be8febc8dda32a21..e7e0063f40b02148a1696e0eb60c3547cfc13857 100644 (file)
--- a/gtk2_ardour/meter_strip.cc
+++ b/gtk2_ardour/meter_strip.cc
@@ -526,7 +526,7 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a)
        }
        int tnh = 0;
        if (_session && _session->config.get_track_name_number()) {
-               tnh = 3 + _session->track_number_decimals() * 8;
+               tnh = 4 + _session->track_number_decimals() * 8;
        }
        namebx.set_size_request(18, nh + tnh);
        namenumberbx.set_size_request(18, nh + tnh);
@@ -744,6 +744,7 @@ MeterStrip::parameter_changed (std::string const & p)
        }
        else if (p == "track-name-number") {
                name_changed();
+               queue_resize();
        }
 }
 
@@ -762,7 +763,7 @@ MeterStrip::name_changed () {
                        number_label.set_text (PBD::to_string (abs(_route->track_number ()), std::dec));
                        number_label.show();
                }
-               number_label.set_size_request(18, 3 + _session->track_number_decimals() * 8);
+               number_label.set_size_request(18, 4 + _session->track_number_decimals() * 8);
        } else {
                number_label.hide();
        }

diff --git a/gtk2_ardour/meterbridge.cc b/gtk2_ardour/meterbridge.cc
index b6b18eff9533555c1b111e5231578bb6d316f9b5..f89d420b613f52c13b8be20f573cc773612c3629 100644 (file)
--- a/gtk2_ardour/meterbridge.cc
+++ b/gtk2_ardour/meterbridge.cc
@@ -796,6 +796,12 @@ Meterbridge::parameter_changed (std::string const & p)
        else if (p == "meterbridge-label-height") {
                scroller.queue_resize();
        }
+       else if (p == "show-monitor-on-meterbridge") {
+               scroller.queue_resize();
+       }
+       else if (p == "track-name-number") {
+               scroller.queue_resize();
+       }
 }
 
 void