diff options
| author | Robin Gareus <robin@gareus.org> | 2015-04-22 21:34:27 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-04-22 21:40:43 +0200 |
| commit | b38ab89d92a5f963c90da885409da541ad081a65 (patch) | |
| tree | b29a21e7a8121f1e37c70d95ad71484d590ed43d /gtk2_ardour/gain_meter.cc | |
| parent | 8d85afd29420a98148ac994f8dcb4e5412b7c2e2 (diff) | |
clean up GUI scaling
Diffstat (limited to 'gtk2_ardour/gain_meter.cc')
| -rw-r--r-- | gtk2_ardour/gain_meter.cc | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/gtk2_ardour/gain_meter.cc b/gtk2_ardour/gain_meter.cc index 99e21a05fc..27a833ab4a 100644 --- a/gtk2_ardour/gain_meter.cc +++ b/gtk2_ardour/gain_meter.cc @@ -101,8 +101,8 @@ GainMeterBase::GainMeterBase (Session* s, bool horizontal, int fader_length, int next_release_selects = false; _width = Wide; - fader_length = rint (fader_length * ARDOUR_UI::config()->get_font_scale() / 102400.); - fader_girth = rint (fader_girth * ARDOUR_UI::config()->get_font_scale() / 102400.); + fader_length = rint (fader_length * ARDOUR_UI::ui_scale); + fader_girth = rint (fader_girth * ARDOUR_UI::ui_scale); if (horizontal) { gain_slider = manage (new HSliderController (&gain_adjustment, boost::shared_ptr<PBD::Controllable>(), fader_length, fader_girth)); @@ -936,7 +936,7 @@ GainMeterBase::redraw_metrics() meter_ticks2_area.queue_draw (); } -#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * scale)) +#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::ui_scale)) GainMeter::GainMeter (Session* s, int fader_length) : GainMeterBase (s, false, fader_length, 24) @@ -953,8 +953,6 @@ GainMeter::GainMeter (Session* s, int fader_length) } gain_display_box.pack_start (peak_display, true, true); - const double scale = ARDOUR_UI::config()->get_font_scale() / 102400.; - meter_metric_area.set_name ("AudioTrackMetrics"); meter_metric_area.set_size_request(PX_SCALE(24, 24), -1); |