From f43aa995a86fa2477bfe613d946ea51075e330f4 Mon Sep 17 00:00:00 2001 From: Robin Gareus Date: Wed, 10 Jul 2013 17:13:45 +0200 Subject: slimming diet for the narrow-mixer strip --- gtk2_ardour/gain_meter.cc | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) (limited to 'gtk2_ardour/gain_meter.cc') diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 82365f03a4..e297d3e1ef 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -277,6 +277,7 @@ GainMeterBase::setup_meters (int len) switch (_width) { case Wide: + meter_metric_area.set_size_request(24, -1); meter_ticks1_area.show(); meter_ticks2_area.show(); if (_route && _route->shared_peak_meter()->input_streams().n_total() == 1) { @@ -285,6 +286,7 @@ GainMeterBase::setup_meters (int len) break; case Narrow: meter_width = 2; + meter_metric_area.set_size_request(20, -1); meter_ticks1_area.hide(); meter_ticks2_area.hide(); break; @@ -987,8 +989,14 @@ 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); + return max(sz.width * 2, min_w * 2) + 6; } gint -- cgit v1.2.3