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

Bug 736411 - Ruler updates cause slowdown when painting

Browse Source 
Reuse the cairo_t from expose() in gimp_ruler_draw_pos() instead of
creating a new one.
This commit is contained in:
Massimo Valentini
2014-12-03 07:44:45 +01:00
committed by Michael Natterer
parent e2d2bdf65c
commit 20863440fb
1 changed files with 27 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

44
libgimpwidgets/gimpruler.c
View File

@ -119,7 +119,8 @@ static gboolean gimp_ruler_expose (GtkWidget *widget,
GdkEventExpose *event); GdkEventExpose *event);
static void gimp_ruler_draw_ticks (GimpRuler *ruler); static void gimp_ruler_draw_ticks (GimpRuler *ruler);
static void gimp_ruler_draw_pos (GimpRuler *ruler); static void gimp_ruler_draw_pos (GimpRuler *ruler,
cairo_t *cr);
static void gimp_ruler_make_pixmap (GimpRuler *ruler); static void gimp_ruler_make_pixmap (GimpRuler *ruler);
static PangoLayout * gimp_ruler_get_layout (GtkWidget *widget, static PangoLayout * gimp_ruler_get_layout (GtkWidget *widget,
@ -616,7 +617,7 @@ gimp_ruler_set_position (GimpRuler *ruler,
priv->position = position; priv->position = position;
g_object_notify (G_OBJECT (ruler), "position"); g_object_notify (G_OBJECT (ruler), "position");
gimp_ruler_draw_pos (ruler); gimp_ruler_draw_pos (ruler, NULL);
} }
} }
@ -894,7 +895,7 @@ gimp_ruler_expose (GtkWidget *widget,
cairo_set_source_surface (cr, priv->backing_store, 0, 0); cairo_set_source_surface (cr, priv->backing_store, 0, 0);
cairo_paint (cr); cairo_paint (cr);
gimp_ruler_draw_pos (ruler); gimp_ruler_draw_pos (ruler, cr);
cairo_destroy (cr); cairo_destroy (cr);
} }
@ -1141,7 +1142,8 @@ out:
} }
static void static void
gimp_ruler_draw_pos (GimpRuler *ruler) gimp_ruler_draw_pos (GimpRuler *ruler,
cairo_t *cr)
{ {
GtkWidget *widget = GTK_WIDGET (ruler); GtkWidget *widget = GTK_WIDGET (ruler);
GtkStyle *style = gtk_widget_get_style (widget); GtkStyle *style = gtk_widget_get_style (widget);
@ -1183,25 +1185,33 @@ gimp_ruler_draw_pos (GimpRuler *ruler)
if ((bs_width > 0) && (bs_height > 0)) if ((bs_width > 0) && (bs_height > 0))
{ {
cairo_t *cr = gdk_cairo_create (gtk_widget_get_window (widget));
gdouble lower; gdouble lower;
gdouble upper; gdouble upper;
gdouble position; gdouble position;
gdouble increment; gdouble increment;
cairo_rectangle (cr, if (! cr)
allocation.x, allocation.y,
allocation.width, allocation.height);
cairo_clip (cr);
cairo_translate (cr, allocation.x, allocation.y);
/* If a backing store exists, restore the ruler */
if (priv->backing_store)
{ {
cairo_set_source_surface (cr, priv->backing_store, 0, 0); cr = gdk_cairo_create (gtk_widget_get_window (widget));
cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
cairo_fill (cr); cairo_rectangle (cr,
allocation.x, allocation.y,
allocation.width, allocation.height);
cairo_clip (cr);
cairo_translate (cr, allocation.x, allocation.y);
/* If a backing store exists, restore the ruler */
if (priv->backing_store)
{
cairo_set_source_surface (cr, priv->backing_store, 0, 0);
cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
cairo_fill (cr);
}
}
else
{
cairo_reference (cr);
} }
position = gimp_ruler_get_position (ruler); position = gimp_ruler_get_position (ruler);