AuroraMiddleware/gtk2
1
0
Fork 0
forked from AuroraMiddleware/gtk
Code Issues Pull Requests Projects Releases Wiki Activity

ruler: Replace gdk_draw_drawable calls with Cairo

Browse Source 
and get rid of the custom GC
This commit is contained in:
Benjamin Otte 2010-07-14 22:43:08 +02:00
parent 5fd0c28c78
commit 41621e212b
1 changed files with 15 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
gtk/gtkruler.c
View File

@ -46,7 +46,6 @@ struct _GtkRulerPriv
GtkOrientation orientation; GtkOrientation orientation;
GtkRulerMetric *metric; GtkRulerMetric *metric;
GdkGC *non_gr_exp_gc;
GdkPixmap *backing_store; GdkPixmap *backing_store;
gint slider_size; gint slider_size;
@ -505,12 +504,6 @@ gtk_ruler_unrealize (GtkWidget *widget)
priv->backing_store = NULL; priv->backing_store = NULL;
} }
if (priv->non_gr_exp_gc)
{
g_object_unref (priv->non_gr_exp_gc);
priv->non_gr_exp_gc = NULL;
}
GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize (widget); GTK_WIDGET_CLASS (gtk_ruler_parent_class)->unrealize (widget);
} }
@ -586,15 +579,15 @@ gtk_ruler_expose (GtkWidget *widget,
{ {
GtkRuler *ruler = GTK_RULER (widget); GtkRuler *ruler = GTK_RULER (widget);
GtkRulerPriv *priv = ruler->priv; GtkRulerPriv *priv = ruler->priv;
cairo_t *cr;
gtk_ruler_draw_ticks (ruler); gtk_ruler_draw_ticks (ruler);
gdk_draw_drawable (widget->window, cr = gdk_cairo_create (widget->window);
priv->non_gr_exp_gc, gdk_cairo_set_source_pixmap (cr, priv->backing_store, 0, 0);
priv->backing_store, gdk_cairo_rectangle (cr, &event->area);
0, 0, 0, 0, cairo_fill (cr);
widget->allocation.width, cairo_destroy (cr);
widget->allocation.height);
gtk_ruler_draw_pos (ruler); gtk_ruler_draw_pos (ruler);
} }
@ -629,12 +622,6 @@ gtk_ruler_make_pixmap (GtkRuler *ruler)
priv->xsrc = 0; priv->xsrc = 0;
priv->ysrc = 0; priv->ysrc = 0;
if (!priv->non_gr_exp_gc)
{
priv->non_gr_exp_gc = gdk_gc_new (widget->window);
gdk_gc_set_exposures (priv->non_gr_exp_gc, FALSE);
}
} }
static void static void
@ -891,13 +878,15 @@ gtk_ruler_real_draw_pos (GtkRuler *ruler)
cairo_t *cr = gdk_cairo_create (widget->window); cairo_t *cr = gdk_cairo_create (widget->window);
/* If a backing store exists, restore the ruler */ /* If a backing store exists, restore the ruler */
if (priv->backing_store) if (priv->backing_store) {
gdk_draw_drawable (widget->window, cairo_t *cr = gdk_cairo_create (widget->window);
widget->style->black_gc,
priv->backing_store, gdk_cairo_set_source_pixmap (cr, priv->backing_store, 0, 0);
priv->xsrc, priv->ysrc, cairo_rectangle (cr, priv->xsrc, priv->ysrc, bs_width, bs_height);
priv->xsrc, priv->ysrc, cairo_fill (cr);
bs_width, bs_height);
cairo_destroy (cr);
}
if (priv->orientation == GTK_ORIENTATION_HORIZONTAL) if (priv->orientation == GTK_ORIENTATION_HORIZONTAL)
{ {