diff options
| author | Robin Gareus <robin@gareus.org> | 2013-07-10 17:13:45 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2013-07-10 17:13:55 +0200 |
| commit | f43aa995a86fa2477bfe613d946ea51075e330f4 (patch) | |
| tree | 65a97ca5a2e077d46f0b9098bed07213dd255383 /gtk2_ardour | |
| parent | ac34c5852b211b33508a9a7d00488704379e234d (diff) | |
slimming diet for the narrow-mixer strip
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 12 | ||||
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 1 |
2 files changed, 11 insertions, 2 deletions
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 diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index c15d3ea221..3403a84028 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -647,6 +647,7 @@ MixerStrip::set_width_enum (Width w, void* owner) gpm.short_astyle_string(gain_automation->automation_style())); gpm.gain_automation_state_button.set_text ( gpm.short_astate_string(gain_automation->automation_state())); + gain_meter().setup_meters (); // recalc meter width if (_route->panner()) { ((Gtk::Label*)panners.pan_automation_style_button.get_child())->set_text ( |