From 45d487f16e8be102bfcdefcd950a69c886495b94 Mon Sep 17 00:00:00 2001 From: Tim Mayberry Date: Wed, 29 Apr 2015 21:30:07 +1000 Subject: Move ARDOUR_UI::ui_scale into UIConfiguration class --- gtk2_ardour/meter_strip.cc | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) (limited to 'gtk2_ardour/meter_strip.cc') diff --git a/gtk2_ardour/meter_strip.cc b/gtk2_ardour/meter_strip.cc index cd33ba345b..3279bd64e1 100644 --- a/gtk2_ardour/meter_strip.cc +++ b/gtk2_ardour/meter_strip.cc @@ -58,7 +58,7 @@ PBD::Signal1 MeterStrip::CatchDeletion; PBD::Signal0 MeterStrip::MetricChanged; PBD::Signal0 MeterStrip::ConfigurationChanged; -#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::ui_scale)) +#define PX_SCALE(pxmin, dflt) rint(std::max((double)pxmin, (double)dflt * ARDOUR_UI::config()->get_ui_scale())) MeterStrip::MeterStrip (int metricmode, MeterType mt) : AxisView(0) @@ -544,8 +544,8 @@ MeterStrip::on_size_allocate (Gtk::Allocation& a) tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_with_of_digit_0_to_9() } - nh *= ARDOUR_UI::ui_scale; - tnh *= ARDOUR_UI::ui_scale; + nh *= ARDOUR_UI::config()->get_ui_scale(); + tnh *= ARDOUR_UI::config()->get_ui_scale(); int prev_height, ignored; bool need_relayout = false; @@ -810,7 +810,7 @@ MeterStrip::name_changed () { } const int tnh = 4 + std::max(2u, _session->track_number_decimals()) * 8; // TODO 8 = max_width_of_digit_0_to_9() // NB numbers are rotated 90deg. on the meterbridge -> use height - number_label.set_size_request(PX_SCALE(18, 18), tnh * ARDOUR_UI::ui_scale); + number_label.set_size_request(PX_SCALE(18, 18), tnh * ARDOUR_UI::config()->get_ui_scale()); } else { number_label.hide(); } -- cgit v1.2.3