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

docs: Replace pixmap use in migration guide with cairo surfaces

Browse Source 
Merge my patch for this with Matthias' previous patch and keep the best
of both.

https://bugzilla.gnome.org/show_bug.cgi?id=642677
This commit is contained in:
Benjamin Otte 2011-02-20 23:42:43 +01:00
parent ff5d4e13de
commit 5f2ac56ec6
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
docs/reference/gtk/migrating-2to3.xml
View File

@ -217,6 +217,10 @@ gdk_cairo_set_source_pixbuf (cr, pixbuf, x, y);
cairo_paint (cr); cairo_paint (cr);
cairo_destroy (cr); cairo_destroy (cr);
</programlisting></informalexample> </programlisting></informalexample>
Note that very similar code can be used when porting code
using GdkPixmap to #cairo_surface_t by calling
cairo_set_source_surface() instead of
gdk_cairo_set_source_pixbuf().
</para> </para>
</example> </example>
<example> <example>
@ -234,20 +238,21 @@ gdk_gc_set_tile (gc, pixmap);
gdk_gc_set_fill (gc, GDK_TILED); gdk_gc_set_fill (gc, GDK_TILED);
gdk_gc_set_ts_origin (gc, x_origin, y_origin); gdk_gc_set_ts_origin (gc, x_origin, y_origin);
/* use */ /* use */
gdk_draw_rectangle (drawable, gc, TRUE, 0, 0, width, height); gdk_draw_rectangle (window, gc, TRUE, 0, 0, width, height);
/* restore */ /* restore */
gdk_gc_set_tile (gc, NULL); gdk_gc_set_tile (gc, NULL);
gdk_gc_set_fill (gc, GDK_SOLID); gdk_gc_set_fill (gc, GDK_SOLID);
gdk_gc_set_ts_origin (gc, 0, 0); gdk_gc_set_ts_origin (gc, 0, 0);
</programlisting></informalexample> </programlisting></informalexample>
The equivalent cairo code looks like this: The equivalent cairo code to draw a tiled surfacelooks
like this:
<informalexample><programlisting> <informalexample><programlisting>
cairo_t *cr; cairo_t *cr;
cairo_surface_t *surface; cairo_surface_t *surface;
surface = ... surface = ...
cr = gdk_cairo_create (window); cr = gdk_cairo_create (window);
gdk_cairo_set_source_surface (cr, surface, x_origin, y_origin); cairo_set_source_surface (cr, surface, x_origin, y_origin);
cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT); cairo_pattern_set_extend (cairo_get_source (cr), CAIRO_EXTEND_REPEAT);
cairo_rectangle (cr, 0, 0, width, height); cairo_rectangle (cr, 0, 0, width, height);
cairo_fill (cr); cairo_fill (cr);
@ -356,14 +361,14 @@ gdk_draw_drawable (pixmap,
</programlisting></informalexample> </programlisting></informalexample>
By using this code: By using this code:
<informalexample><programlisting> <informalexample><programlisting>
cairo_t *cr = gdk_cairo_create (window); cairo_t *cr = cairo_create (surface);
/* clipping restricts the intermediate surface's size, so it's a good idea /* clipping restricts the intermediate surface's size, so it's a good idea
* to use it. */ * to use it. */
gdk_cairo_rectangle (cr, &amp;area); gdk_cairo_rectangle (cr, &amp;area);
cairo_clip (cr); cairo_clip (cr);
/* Now push a group to change the target */ /* Now push a group to change the target */
cairo_push_group (cr); cairo_push_group (cr);
gdk_cairo_set_source_surface (cr, surface, dx, dy); cairo_set_source_surface (cr, surface, dx, dy);
cairo_paint (cr); cairo_paint (cr);
/* Now copy the intermediate target back */ /* Now copy the intermediate target back */
cairo_pop_group_to_source (cr); cairo_pop_group_to_source (cr);
@ -769,8 +774,8 @@ on_alpha_screen_changed (GtkWindow *window,
<para> <para>
#GdkDrawable has been removed in GTK+ 3, together with #GdkPixmap #GdkDrawable has been removed in GTK+ 3, together with #GdkPixmap
and #GdkImage. The only remaining drawable class is #GdkWindow. and #GdkImage. The only remaining drawable class is #GdkWindow.
For dealing with image data, you should use cairo surfaces or For dealing with image data, you should use a #cairo_surface_t or
#GdkPixbufs. a #GdkPixbuf.
</para> </para>
<para> <para>