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/marker.cc | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'gtk2_ardour/marker.cc') diff --git a/gtk2_ardour/marker.cc b/gtk2_ardour/marker.cc index 0c7376934c..49b4f2c1b0 100644 --- a/gtk2_ardour/marker.cc +++ b/gtk2_ardour/marker.cc @@ -77,8 +77,8 @@ ArdourMarker::ArdourMarker (PublicEditor& ed, ArdourCanvas::Container& parent, g { const double MH = marker_height - 1; - const double M3 = std::max(1.f, rintf(3.f * ARDOUR_UI::ui_scale)); - const double M6 = std::max(2.f, rintf(6.f * ARDOUR_UI::ui_scale)); + const double M3 = std::max(1.f, rintf(3.f * ARDOUR_UI::config()->get_ui_scale())); + const double M6 = std::max(2.f, rintf(6.f * ARDOUR_UI::config()->get_ui_scale())); /* Shapes we use: * @@ -403,7 +403,7 @@ ArdourMarker::setup_name_display () limit = _right_label_limit; } - const float padding = std::max(2.f, rintf(2.f * ARDOUR_UI::ui_scale)); + const float padding = std::max(2.f, rintf(2.f * ARDOUR_UI::config()->get_ui_scale())); /* Work out how wide the name can be */ int name_width = min ((double) pixel_width (_name, name_font) + padding, limit); -- cgit v1.2.3