From c46bfcf752aed58bd210a1766037a62cdbd68773 Mon Sep 17 00:00:00 2001 From: Matthias Clasen Date: Mon, 2 May 2016 13:30:20 -0400 Subject: css: Stop drawing double borders for builtins The fallback code for rendering builtin checks, radios and expanders was using border parameters. With the generic gadget borders using the same parameters, this was giving double borders. --- gtk/gtkcssimagebuiltin.c | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) diff --git a/gtk/gtkcssimagebuiltin.c b/gtk/gtkcssimagebuiltin.c index 07d2fec633..59944e1585 100644 --- a/gtk/gtkcssimagebuiltin.c +++ b/gtk/gtkcssimagebuiltin.c @@ -66,18 +66,6 @@ gtk_css_image_builtin_draw_check (GtkCssImage *image, x = - (1 + exterior_size - (gint) width) / 2; y = - (1 + exterior_size - (gint) height) / 2; - if (builtin->border_width > 0) - { - cairo_set_line_width (cr, builtin->border_width); - - cairo_rectangle (cr, x + 0.5, y + 0.5, exterior_size - 1, exterior_size - 1); - gdk_cairo_set_source_rgba (cr, &builtin->bg_color); - cairo_fill_preserve (cr); - - gdk_cairo_set_source_rgba (cr, &builtin->border_color); - cairo_stroke (cr); - } - gdk_cairo_set_source_rgba (cr, &builtin->fg_color); if (inconsistent) @@ -148,24 +136,6 @@ gtk_css_image_builtin_draw_option (GtkCssImage *image, x = - (1 + exterior_size - width) / 2; y = - (1 + exterior_size - height) / 2; - if (builtin->border_width > 0) - { - cairo_set_line_width (cr, builtin->border_width); - - cairo_new_sub_path (cr); - cairo_arc (cr, - x + exterior_size / 2., - y + exterior_size / 2., - (exterior_size - 1) / 2., - 0, 2 * G_PI); - - gdk_cairo_set_source_rgba (cr, &builtin->bg_color); - cairo_fill_preserve (cr); - - gdk_cairo_set_source_rgba (cr, &builtin->border_color); - cairo_stroke (cr); - } - gdk_cairo_set_source_rgba (cr, &builtin->fg_color); /* FIXME: thickness */ @@ -355,10 +325,7 @@ gtk_css_image_builtin_draw_expander (GtkCssImage *image, gdk_cairo_set_source_rgba (cr, &builtin->fg_color); - cairo_fill_preserve (cr); - - gdk_cairo_set_source_rgba (cr, &builtin->border_color); - cairo_stroke (cr); + cairo_fill (cr); } static void -- cgit v1.2.1