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/meter_patterns.cc | |
| parent | 8d85afd29420a98148ac994f8dcb4e5412b7c2e2 (diff) | |
clean up GUI scaling
Diffstat (limited to 'gtk2_ardour/meter_patterns.cc')
| -rw-r--r-- | gtk2_ardour/meter_patterns.cc | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/gtk2_ardour/meter_patterns.cc b/gtk2_ardour/meter_patterns.cc index b70a75a3a2..b7c82b4818 100644 --- a/gtk2_ardour/meter_patterns.cc +++ b/gtk2_ardour/meter_patterns.cc @@ -289,8 +289,7 @@ meter_render_ticks (Gtk::Widget& w, MeterType type, vector<ARDOUR::DataType> typ float box_l=0; float box_w=0; - const double scale = ARDOUR_UI::config()->get_font_scale() / 102400.; -#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)) if (tickleft) { if (w.get_name().substr(0, 3) == "Bar") { box_w = PX_SCALE(2, 2); @@ -620,7 +619,7 @@ meter_render_metrics (Gtk::Widget& w, MeterType type, vector<DataType> types) const double fixfontsize = 1.125; #else // counter-act global font-scaling. - const double fixfontsize = std::min(1.0, 0.9 / sqrt((double) ARDOUR_UI::config()->get_font_scale() / 102400.)); + const double fixfontsize = std::min(1.0, 0.9 / sqrtf(ARDOUR_UI::ui_scale)); #endif font.set_weight (Pango::WEIGHT_NORMAL); |