callisto-debian/gimp
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

use cairo_save()/cairo_restore() around calling the virtual function

Browse Source 
2007-11-13  Michael Natterer  <mitch@gimp.org>

	* app/widgets/gimpviewrenderer.c (gimp_view_renderer_draw): use
	cairo_save()/cairo_restore() around calling the virtual function
	instead of restoring the clipping area manually.


svn path=/trunk/; revision=24148
This commit is contained in:
Michael Natterer
2007-11-13 16:00:13 +00:00
committed by Michael Natterer
parent 6bdca50d0b
commit ac39ccfb91
2 changed files with 10 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ChangeLog
View File

@ -1,3 +1,9 @@
2007-11-13 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpviewrenderer.c (gimp_view_renderer_draw): use
cairo_save()/cairo_restore() around calling the virtual function
instead of restoring the clipping area manually.
2007-11-13 Michael Natterer <mitch@gimp.org> 2007-11-13 Michael Natterer <mitch@gimp.org>
* app/widgets/gimpviewrenderervectors.c * app/widgets/gimpviewrenderervectors.c

14
app/widgets/gimpviewrenderer.c
View File

@ -606,8 +606,12 @@ gimp_view_renderer_draw (GimpViewRenderer *renderer,
if (renderer->viewable) if (renderer->viewable)
{ {
cairo_save (cr);
GIMP_VIEW_RENDERER_GET_CLASS (renderer)->draw (renderer, GIMP_VIEW_RENDERER_GET_CLASS (renderer)->draw (renderer,
widget, cr, draw_area); widget, cr, draw_area);
cairo_restore (cr);
} }
else else
{ {
@ -630,16 +634,6 @@ gimp_view_renderer_draw (GimpViewRenderer *renderer,
gint height = renderer->height + renderer->border_width; gint height = renderer->height + renderer->border_width;
gdouble x, y; gdouble x, y;
if (renderer->viewable)
{
/* reset clipping because the draw() implementation is
* allowed to do additional clipping
*/
cairo_reset_clip (cr);
gdk_cairo_rectangle (cr, &render_rect);
cairo_clip (cr);
}
cairo_set_line_width (cr, renderer->border_width); cairo_set_line_width (cr, renderer->border_width);
cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND); cairo_set_line_join (cr, CAIRO_LINE_JOIN_ROUND);
gimp_cairo_set_source_color (cr, &renderer->border_color); gimp_cairo_set_source_color (cr, &renderer->border_color);