dnrops
/
gimp
mirror of https://github.com/GNOME/gimp.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

libgimpwidgets: port the GimpChainButton lines to cairo 

A proper two-pixel line in FG color looks a lot less shabby...
This commit is contained in:
Michael Natterer 2010-10-15 10:35:28 +02:00
parent 84274e2230
commit 1de338ea9d
1 changed files with 19 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

37
libgimpwidgets/gimpchainbutton.c
View File

@ -376,12 +376,16 @@ static gboolean
gimp_chain_line_expose_event (GtkWidget *widget, gimp_chain_line_expose_event (GtkWidget *widget,
GdkEventExpose *event) GdkEventExpose *event)
{ {
GtkStyle *style = gtk_widget_get_style (widget);
GimpChainLine *line = ((GimpChainLine *) widget); GimpChainLine *line = ((GimpChainLine *) widget);
GtkAllocation allocation; GtkAllocation allocation;
GdkPoint points[3]; GdkPoint points[3];
GdkPoint buf;
GtkShadowType shadow;
GimpChainPosition position; GimpChainPosition position;
cairo_t *cr;
cr = gdk_cairo_create (gtk_widget_get_window (widget));
gdk_cairo_region (cr, event->region);
cairo_clip (cr);
gtk_widget_get_allocation (widget, &allocation); gtk_widget_get_allocation (widget, &allocation);
@ -419,7 +423,6 @@ gimp_chain_line_expose_event (GtkWidget *widget,
points[2].y = (line->which == 1 ? points[2].y = (line->which == 1 ?
allocation.y + allocation.height - 1 : allocation.y + allocation.height - 1 :
allocation.y); allocation.y);
shadow = GTK_SHADOW_ETCHED_IN;
break; break;
case GIMP_CHAIN_RIGHT: case GIMP_CHAIN_RIGHT:
@ -430,7 +433,6 @@ gimp_chain_line_expose_event (GtkWidget *widget,
points[2].y = (line->which == 1 ? points[2].y = (line->which == 1 ?
allocation.y + allocation.height - 1 : allocation.y + allocation.height - 1 :
allocation.y); allocation.y);
shadow = GTK_SHADOW_ETCHED_OUT;
break; break;
case GIMP_CHAIN_TOP: case GIMP_CHAIN_TOP:
@ -441,7 +443,6 @@ gimp_chain_line_expose_event (GtkWidget *widget,
allocation.x + allocation.width - 1 : allocation.x + allocation.width - 1 :
allocation.x); allocation.x);
points[2].y = points[1].y; points[2].y = points[1].y;
shadow = GTK_SHADOW_ETCHED_OUT;
break; break;
case GIMP_CHAIN_BOTTOM: case GIMP_CHAIN_BOTTOM:
@ -452,29 +453,23 @@ gimp_chain_line_expose_event (GtkWidget *widget,
allocation.x + allocation.width - 1 : allocation.x + allocation.width - 1 :
allocation.x); allocation.x);
points[2].y = points[1].y; points[2].y = points[1].y;
shadow = GTK_SHADOW_ETCHED_IN;
break; break;
default: default:
return FALSE; return FALSE;
} }
if ( ((shadow == GTK_SHADOW_ETCHED_OUT) && (line->which == -1)) || cairo_move_to (cr, points[0].x, points[0].y);
((shadow == GTK_SHADOW_ETCHED_IN) && (line->which == 1)) ) cairo_line_to (cr, points[1].x, points[1].y);
{ cairo_line_to (cr, points[2].x, points[2].y);
buf = points[0];
points[0] = points[2];
points[2] = buf;
}
gtk_paint_polygon (gtk_widget_get_style (widget), cairo_set_line_width (cr, 2.0);
gtk_widget_get_window (widget), GTK_STATE_NORMAL, cairo_set_line_cap (cr, CAIRO_LINE_CAP_BUTT);
shadow, gdk_cairo_set_source_color (cr, &style->fg[GTK_STATE_NORMAL]);
&event->area,
widget, cairo_stroke (cr);
"chainbutton",
points, 3, cairo_destroy (cr);
FALSE);
return TRUE; return TRUE;
} }