diff options
| author | Robin Gareus <robin@gareus.org> | 2015-04-20 05:35:23 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2015-04-20 20:45:36 +0200 |
| commit | 494009a6e28bafac071a3160fbf385c6a076ae8e (patch) | |
| tree | 84b02a17fa27d94903f6816b9d5df477cdb1db55 /gtk2_ardour/ardour_button.cc | |
| parent | 00f06ca9e91470f92d8f6d5ef83cbae069904f51 (diff) | |
towards scaleable meter and mixer UI
somewhat hacky solution, but there's no good central point to
control this and get integer rounding/summing, is there?
Diffstat (limited to 'gtk2_ardour/ardour_button.cc')
| -rw-r--r-- | gtk2_ardour/ardour_button.cc | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index 6381fbcb74..33f0a6852e 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -199,11 +199,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) uint32_t text_color; uint32_t led_color; -#ifdef __APPLE__ - const double dpiscale = 1.0; -#else const double dpiscale = ARDOUR_UI::config()->get_font_scale () / 102400.; -#endif const double corner_radius = std::max(2.0, _corner_radius * dpiscale); if (_update_colors) { @@ -326,7 +322,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) if ((_elements & VectorIcon) && _icon == RecTapeMode) { const double x = get_width() * .5; const double y = get_height() * .5; - const double r = std::min(10., std::min(x, y) * .6); // TODO we need a better way to limit max. radius. + const double r = std::min(x, y) * .6; const double slit = .11 * M_PI; cairo_save(cr); cairo_translate(cr, x, y); @@ -384,7 +380,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) else if ((_elements & VectorIcon) && _icon == RecButton) { const double x = get_width() * .5; const double y = get_height() * .5; - const double r = std::min(10., std::min(x, y) * .55); // TODO we need a better way to limit max. radius. + const double r = std::min(x, y) * .55; cairo_arc (cr, x, y, r, 0, 2 * M_PI); if (active_state() == Gtkmm2ext::ExplicitActive) cairo_set_source_rgba (cr, .95, .1, .1, 1.); |