diff options
| author | Tim Mayberry <mojofunk@gmail.com> | 2015-04-29 21:30:07 +1000 |
|---|---|---|
| committer | Paul Davis <paul@linuxaudiosystems.com> | 2015-09-16 16:55:17 -0400 |
| commit | 45d487f16e8be102bfcdefcd950a69c886495b94 (patch) | |
| tree | c7c043a09d5f363030374330f1a7cd354d561c4b /gtk2_ardour/marker.cc | |
| parent | 74db5abc7ea5429bc47942475841dfca328ab3ac (diff) | |
Move ARDOUR_UI::ui_scale into UIConfiguration class
Diffstat (limited to 'gtk2_ardour/marker.cc')
| -rw-r--r-- | gtk2_ardour/marker.cc | 6 |
1 files changed, 3 insertions, 3 deletions
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); |