diff --git a/libs/widgets/ardour_button.cc b/libs/widgets/ardour_button.cc index a1081920ed..c376eec21f 100644 --- a/libs/widgets/ardour_button.cc +++ b/libs/widgets/ardour_button.cc @@ -565,7 +565,7 @@ ArdourButton::render (Cairo::RefPtr const& ctx, cairo_rectangle_ const float triw2 = ceil(.577 * _diameter * .5); // 1/sqrt(3) Equilateral triangle //menu arrow cairo_set_source_rgba (cr, 1, 1, 1, 0.4); - cairo_move_to(cr, get_width() - triw2 - 5, rint((get_height() + trih) * .5)); + cairo_move_to(cr, get_width() - triw2 - 5 * scale, rint((get_height() + trih) * .5)); cairo_rel_line_to(cr, -triw2, -trih); cairo_rel_line_to(cr, 2. * triw2, 0); cairo_close_path(cr); @@ -573,7 +573,7 @@ ArdourButton::render (Cairo::RefPtr const& ctx, cairo_rectangle_ cairo_set_source_rgba (cr, 1, 1, 1, 0.4); cairo_fill(cr); - cairo_move_to(cr, get_width() - triw2 - 5, rint((get_height() + trih) * .5)); + cairo_move_to(cr, get_width() - triw2 - 5 * scale, rint((get_height() + trih) * .5)); cairo_rel_line_to(cr, .5 - triw2, .5 - trih); cairo_rel_line_to(cr, 2. * triw2 - 1, 0); cairo_close_path(cr); @@ -583,8 +583,8 @@ ArdourButton::render (Cairo::RefPtr const& ctx, cairo_rectangle_ } if (_elements & MetaMenu) { - cairo_move_to(cr, get_width() - floor (_diameter) - 6.5, 1); - cairo_line_to(cr, get_width() - floor (_diameter) - 6.5, get_height () -1); + cairo_move_to(cr, get_width() - floor (_diameter) - 6.5 * scale, 1); + cairo_line_to(cr, get_width() - floor (_diameter) - 6.5 * scale, get_height () -1); Gtkmm2ext::set_source_rgba (cr, outline_color); cairo_set_line_width(cr, 1); cairo_stroke(cr); diff --git a/libs/widgets/metabutton.cc b/libs/widgets/metabutton.cc index bfd2dc1507..02b63e6707 100644 --- a/libs/widgets/metabutton.cc +++ b/libs/widgets/metabutton.cc @@ -251,13 +251,14 @@ MetaButton::render (Cairo::RefPtr const& ctx, cairo_rectangle_t* ArdourButton::render (ctx, rect); } if (_hovering && UIConfigurationBase::instance ().get_widget_prelight ()) { + const float scale = UIConfigurationBase::instance().get_ui_scale(); const bool boxy = (_tweaks & ForceBoxy) | boxy_buttons (); - const float corner_radius = boxy ? 0 : std::max (2.f, _corner_radius * UIConfigurationBase::instance ().get_ui_scale ()); + const float corner_radius = boxy ? 0 : std::max (2.f, _corner_radius * scale); cairo_t* cr = ctx->cobj (); if (_hover_dropdown) { - Gtkmm2ext::rounded_right_half_rectangle (cr, get_width () - _diameter - 6, 1, _diameter + 5, get_height () - 2, corner_radius); + Gtkmm2ext::rounded_right_half_rectangle (cr, get_width () - _diameter - 6 * scale, 1, _diameter + 5 * scale, get_height () - 2, corner_radius); } else { - Gtkmm2ext::rounded_left_half_rectangle (cr, 1, 1, get_width () - _diameter - 8, get_height () - 2, corner_radius); + Gtkmm2ext::rounded_left_half_rectangle (cr, 1, 1, get_width () - _diameter - 8 * scale, get_height () - 2 * scale, corner_radius); } cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2); cairo_fill (cr);