diff options
| author | Robin Gareus <robin@gareus.org> | 2014-09-03 15:21:19 +0200 |
|---|---|---|
| committer | Robin Gareus <robin@gareus.org> | 2014-09-03 15:21:19 +0200 |
| commit | b0660b3e7d83b441fd204f71fb1b24ed9ee8f95f (patch) | |
| tree | 096f888d9000a975839e8a80170a77e565731c5d /gtk2_ardour | |
| parent | 73357c1923eec79b98f8237d2d6e1de654f45d22 (diff) | |
Update Ardour Button radii.
This is effectively a noop. Decrease default radius,
only add to radius (for outline), never subtract to avioid
negative numbers.
Diffstat (limited to 'gtk2_ardour')
| -rw-r--r-- | gtk2_ardour/ardour_button.cc | 14 |
1 files changed, 7 insertions, 7 deletions
diff --git a/gtk2_ardour/ardour_button.cc b/gtk2_ardour/ardour_button.cc index ccf1b3f3fa..89f21ecf5c 100644 --- a/gtk2_ardour/ardour_button.cc +++ b/gtk2_ardour/ardour_button.cc @@ -63,7 +63,7 @@ ArdourButton::ArdourButton (Element e) , _text_width (0) , _text_height (0) , _diameter (11.0) - , _corner_radius (4.0) + , _corner_radius (2.5) , _corner_mask (0xf) , _angle(0) , _xalign(.5) @@ -227,7 +227,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) // background fill if ((_elements & Body)==Body) { - rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius-1.5); + rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius); if (active_state() == Gtkmm2ext::ImplicitActive && !((_elements & Indicator)==Indicator)) { ArdourCanvas::set_source_rgba (cr, fill_inactive_color); cairo_fill (cr); @@ -246,7 +246,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) if ((_elements & Body)==Body) { if (active_state() == Gtkmm2ext::ImplicitActive && !((_elements & Indicator)==Indicator)) { cairo_set_line_width (cr, 2.0); - rounded_function (cr, 2, 2, get_width() - 4, get_height() - 4, _corner_radius-2); + rounded_function (cr, 2, 2, get_width() - 4, get_height() - 4, _corner_radius); ArdourCanvas::set_source_rgba (cr, fill_active_color); cairo_stroke (cr); } @@ -257,11 +257,11 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) if ( active_state() == Gtkmm2ext::ExplicitActive && !((_elements & Indicator)==Indicator) ) { //concave cairo_set_source (cr, concave_pattern); - Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius-1.5); + Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius); cairo_fill (cr); } else { cairo_set_source (cr, convex_pattern); - Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius-1.5); + Gtkmm2ext::rounded_rectangle (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius); cairo_fill (cr); } } @@ -471,7 +471,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) // a transparent gray layer to indicate insensitivity if ((visual_state() & Gtkmm2ext::Insensitive)) { - rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius-1.5); + rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius); cairo_set_source_rgba (cr, 0.505, 0.517, 0.525, 0.6); cairo_fill (cr); } @@ -480,7 +480,7 @@ ArdourButton::render (cairo_t* cr, cairo_rectangle_t *) if (ARDOUR::Config->get_widget_prelight() && !((visual_state() & Gtkmm2ext::Insensitive))) { if (_hovering) { - rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius-1.5); + rounded_function (cr, 1, 1, get_width() - 2, get_height() - 2, _corner_radius); cairo_set_source_rgba (cr, 0.905, 0.917, 0.925, 0.2); cairo_fill (cr); } |