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

app: missed two shell->canvas, use gimp_canvas_item_get_canvas() instead

This commit is contained in:
Michael Natterer 2013-04-18 14:44:09 +02:00
parent 52b92e740f
commit 59c7d42530
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
app/display/gimpcanvaspath.c
View File

@ -250,14 +250,15 @@ gimp_canvas_path_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell)
{
GimpCanvasPathPrivate *private = GET_PRIVATE (item);
GtkWidget *canvas = gimp_canvas_item_get_canvas (item);
if (private->path && gtk_widget_get_realized (shell->canvas))
if (private->path && gtk_widget_get_realized (canvas))
{
cairo_t *cr;
cairo_rectangle_int_t rectangle;
gdouble x1, y1, x2, y2;
cr = gdk_cairo_create (gtk_widget_get_window (shell->canvas));
cr = gdk_cairo_create (gtk_widget_get_window (canvas));
cairo_save (cr);
cairo_translate (cr, -shell->offset_x, -shell->offset_y);

3
app/display/gimpcanvassamplepoint.c
View File

@ -219,6 +219,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem *item,
cairo_t *cr)
{
GimpCanvasSamplePointPrivate *private = GET_PRIVATE (item);
GtkWidget *canvas = gimp_canvas_item_get_canvas (item);
PangoLayout *layout;
gdouble x, y;
gint x1, x2, y1, y2;
@ -246,7 +247,7 @@ gimp_canvas_sample_point_draw (GimpCanvasItem *item,
_gimp_canvas_item_stroke (item, cr);
layout = gimp_canvas_get_layout (GIMP_CANVAS (shell->canvas),
layout = gimp_canvas_get_layout (GIMP_CANVAS (canvas),
"%d", private->index);
cairo_move_to (cr, x + 2.5, y + 2.5);