diff options
| author | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-28 10:12:01 -0400 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2014-10-28 20:31:06 -0400 |
| commit | 0abcce07353cb32aa30c78952ae8d9bf99882e78 (patch) | |
| tree | b6d7f19328d9f10cc604610e3d4088a693a67dfa /gtk2_ardour/gain_meter.cc | |
| parent | 4ed910748c422956ff915818a5506cfb90316106 (diff) | |
Revert "change the peak display widget from Gtkmm2ext::FocusEntry to ArdourButton, since it is absolutely not editable."
This reverts commit 58f7d02bf21776f7537ac16ae41646859dbca0b1.
Conflicts:
gtk2_ardour/default_ui_config.in
gtk2_ardour/gain_meter.cc
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index b0ed45df85..ff91f5a74a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -101,11 +101,12 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int gain_display.signal_focus_out_event().connect (sigc::mem_fun (*this, &GainMeter::gain_focused), false); gain_display.set_alignment(0.5); - peak_display.set_name ("peak display"); - peak_display.set_layout_font (ARDOUR_UI::config()->get_SmallFont()); + peak_display.set_name ("MixerStripPeakDisplay"); + set_size_request_to_display_given_text (peak_display, "-80.g", 2, 6); /* note the descender */ max_peak = minus_infinity(); peak_display.set_text (_("-inf")); - peak_display.set_alignment (0.5, 0.5); + peak_display.unset_flags (Gtk::CAN_FOCUS); + peak_display.set_alignment(0.5); gain_automation_style_button.set_name ("mixer strip button"); gain_automation_state_button.set_name ("mixer strip button"); @@ -364,7 +365,7 @@ GainMeterBase::reset_peak_display () level_meter->clear_meters(); max_peak = -INFINITY; peak_display.set_text (_("-inf")); - peak_display.set_active (false); + peak_display.set_name ("MixerStripPeakDisplay"); } void @@ -865,9 +866,8 @@ GainMeterBase::update_meters() peak_display.set_text (buf); } } - if (mpeak >= Config->get_meter_peak()) { - peak_display.set_active (true); + peak_display.set_name ("MixerStripPeakDisplayPeak"); } } |