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/mixer_strip.cc | |
| parent | 74db5abc7ea5429bc47942475841dfca328ab3ac (diff) | |
Move ARDOUR_UI::ui_scale into UIConfiguration class
Diffstat (limited to 'gtk2_ardour/mixer_strip.cc')
| -rw-r--r-- | gtk2_ardour/mixer_strip.cc | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/gtk2_ardour/mixer_strip.cc b/gtk2_ardour/mixer_strip.cc index 5054c5e2d4..64f4a64c31 100644 --- a/gtk2_ardour/mixer_strip.cc +++ b/gtk2_ardour/mixer_strip.cc @@ -257,7 +257,7 @@ MixerStrip::init () _comment_button.signal_clicked.connect (sigc::mem_fun (*this, &RouteUI::toggle_comment_editor)); // TODO implement ArdourKnob::on_size_request properly -#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::ui_scale)) +#define PX_SCALE(px) std::max((float)px, rintf((float)px * ARDOUR_UI::config()->get_ui_scale())) trim_control.set_size_request (PX_SCALE(19), PX_SCALE(19)); #undef PX_SCALE trim_control.set_tooltip_prefix (_("Trim: ")); @@ -703,7 +703,7 @@ MixerStrip::set_width_enum (Width w, void* owner) set_button_names (); - const float scale = std::max(1.f, ARDOUR_UI::ui_scale); + const float scale = std::max(1.f, ARDOUR_UI::config()->get_ui_scale()); switch (w) { case Wide: |