diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-10 15:11:51 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 15:27:17 +0200 |
| commit | 84465f1ca2d664df20e99c25c1c29938a1848505 (patch) | |
| tree | 5b2b2f3200121457820cf76ce7b15d487d61212b /gtk2_ardour/gain_meter.cc | |
| parent | 50a1eb04a5b30b501ffcb425fd11df7a830126ff (diff) | |
cleanup - prepare narrow mixer strips
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 31 |
1 files changed, 15 insertions, 16 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 8fbf2d4252..82365f03a4 100644 --- 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 @@ -894,7 +893,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 +936,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); } |