diff options
| author | Ben Loftis <ben@harrisonconsoles.com> | 2014-07-30 12:30:15 -0500 |
|---|---|---|
| committer | Ben Loftis <ben@harrisonconsoles.com> | 2014-07-30 12:30:33 -0500 |
| commit | 394ea9cb860354c1f24bbecf5a85e88d1a16d136 (patch) | |
| tree | 89094750a86c3f6bd173025fe6e6752068411a54 | |
| parent | f91846d5f8c53a2c8401de1ac958cf46ce9de824 (diff) | |
use FocusEntry for the peak_display, so it matches the size of gain_display
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 8 | ||||
| -rw-r--r-- | gtk2_ardour/gain_meter.h | 3 |
2 files changed, 6 insertions, 5 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 76a7c3540e..571cffe0a1 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -104,7 +104,7 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int 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_label (_("-inf")); + peak_display.set_text (_("-inf")); peak_display.unset_flags (Gtk::CAN_FOCUS); gain_automation_style_button.set_name ("mixer strip button"); @@ -364,7 +364,7 @@ GainMeterBase::reset_peak_display () _meter->reset_max(); level_meter->clear_meters(); max_peak = -INFINITY; - peak_display.set_label (_("-inf")); + peak_display.set_text (_("-inf")); peak_display.set_name ("MixerStripPeakDisplay"); } @@ -863,10 +863,10 @@ GainMeterBase::update_meters() if (mpeak > max_peak) { max_peak = mpeak; if (mpeak <= -200.0f) { - peak_display.set_label (_("-inf")); + peak_display.set_text (_("-inf")); } else { snprintf (buf, sizeof(buf), "%.1f", mpeak); - peak_display.set_label (buf); + peak_display.set_text (buf); } } if (mpeak >= Config->get_meter_peak()) { diff --git a/gtk2_ardour/gain_meter.h b/gtk2_ardour/gain_meter.h index b71469b4c6..d54dd24d0a 100644 --- a/gtk2_ardour/gain_meter.h +++ b/gtk2_ardour/gain_meter.h @@ -114,7 +114,8 @@ class GainMeterBase : virtual public sigc::trackable, ARDOUR::SessionHandlePtr Gtkmm2ext::SliderController *gain_slider; Gtk::Adjustment gain_adjustment; Gtkmm2ext::FocusEntry gain_display; - Gtk::Button peak_display; + Gtkmm2ext::FocusEntry peak_display; +// Gtk::Button peak_display; Gtk::DrawingArea meter_metric_area; Gtk::DrawingArea meter_ticks1_area; Gtk::DrawingArea meter_ticks2_area; |