diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2011-01-29 23:50:53 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2011-01-30 09:22:57 +0800 |
| commit | 21ab8044dab93b6367463593628ec42befda4f67 (patch) | |
| tree | 50948c4b0675041b615b5113d7b9176f2d71db99 /libgnomecanvas | |
| parent | 8fade835168c511a89813019aef6d0ee02d63b5d (diff) | |
| download | gsoc2013-evolution-21ab8044dab93b6367463593628ec42befda4f67.tar.gz gsoc2013-evolution-21ab8044dab93b6367463593628ec42befda4f67.tar.zst gsoc2013-evolution-21ab8044dab93b6367463593628ec42befda4f67.zip | |
Coding style and whitespace cleanup.
Diffstat (limited to 'libgnomecanvas')
| -rw-r--r-- | libgnomecanvas/gnome-canvas-pixbuf.c | 7 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas-rect.c | 4 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas-text.c | 8 | ||||
| -rw-r--r-- | libgnomecanvas/gnome-canvas.c | 11 |
4 files changed, 21 insertions, 9 deletions
diff --git a/libgnomecanvas/gnome-canvas-pixbuf.c b/libgnomecanvas/gnome-canvas-pixbuf.c index 6fc3e44fd9..82152bd629 100644 --- a/libgnomecanvas/gnome-canvas-pixbuf.c +++ b/libgnomecanvas/gnome-canvas-pixbuf.c @@ -49,7 +49,9 @@ static void gnome_canvas_pixbuf_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gnome_canvas_pixbuf_update (GnomeCanvasItem *item, const cairo_matrix_t *i2c, gint flags); +static void gnome_canvas_pixbuf_update (GnomeCanvasItem *item, + const cairo_matrix_t *i2c, + gint flags); static void gnome_canvas_pixbuf_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint height); static GnomeCanvasItem *gnome_canvas_pixbuf_point (GnomeCanvasItem *item, @@ -250,7 +252,8 @@ gnome_canvas_pixbuf_update (GnomeCanvasItem *item, priv = gcp->priv; if (GNOME_CANVAS_ITEM_CLASS (gnome_canvas_pixbuf_parent_class)->update) - GNOME_CANVAS_ITEM_CLASS (gnome_canvas_pixbuf_parent_class)->update (item, i2c, flags); + GNOME_CANVAS_ITEM_CLASS (gnome_canvas_pixbuf_parent_class)-> + update (item, i2c, flags); /* ordinary update logic */ gnome_canvas_request_redraw ( diff --git a/libgnomecanvas/gnome-canvas-rect.c b/libgnomecanvas/gnome-canvas-rect.c index 853992e254..a61c98f3c4 100644 --- a/libgnomecanvas/gnome-canvas-rect.c +++ b/libgnomecanvas/gnome-canvas-rect.c @@ -85,7 +85,9 @@ G_DEFINE_TYPE (GnomeCanvasRect, gnome_canvas_rect, GNOME_TYPE_CANVAS_ITEM) static guint32 get_rgba_from_color (GdkColor *color) { - return ((color->red & 0xff00) << 16) | ((color->green & 0xff00) << 8) | (color->blue & 0xff00) | 0xff; + return ((color->red & 0xff00) << 16) | + ((color->green & 0xff00) << 8) | + (color->blue & 0xff00) | 0xff; } static gboolean diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c index a012c76df8..a9e546a883 100644 --- a/libgnomecanvas/gnome-canvas-text.c +++ b/libgnomecanvas/gnome-canvas-text.c @@ -105,7 +105,9 @@ static void gnome_canvas_text_get_property (GObject *object, GValue *value, GParamSpec *pspec); -static void gnome_canvas_text_update (GnomeCanvasItem *item, const cairo_matrix_t *matrix, gint flags); +static void gnome_canvas_text_update (GnomeCanvasItem *item, + const cairo_matrix_t *matrix, + gint flags); static void gnome_canvas_text_draw (GnomeCanvasItem *item, cairo_t *cr, gint x, gint y, gint width, gint height); static GnomeCanvasItem *gnome_canvas_text_point (GnomeCanvasItem *item, @@ -635,7 +637,9 @@ gnome_canvas_text_set_property (GObject *object, text = GNOME_CANVAS_TEXT (object); if (!text->layout) - text->layout = pango_layout_new (gtk_widget_get_pango_context (GTK_WIDGET (item->canvas))); + text->layout = pango_layout_new ( + gtk_widget_get_pango_context ( + GTK_WIDGET (item->canvas))); switch (param_id) { case PROP_TEXT: diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c index c28bc824e9..86624f2b99 100644 --- a/libgnomecanvas/gnome-canvas.c +++ b/libgnomecanvas/gnome-canvas.c @@ -160,8 +160,9 @@ gnome_canvas_item_get_type (void) NULL /* value_table */ }; - canvas_item_type = g_type_register_static (G_TYPE_INITIALLY_UNOWNED, "GnomeCanvasItem", - &object_info, 0); + canvas_item_type = g_type_register_static ( + G_TYPE_INITIALLY_UNOWNED, + "GnomeCanvasItem", &object_info, 0); } return canvas_item_type; @@ -1504,7 +1505,7 @@ gnome_canvas_group_draw (GnomeCanvasItem *item, if ((child->flags & GNOME_CANVAS_ITEM_VISIBLE) && ((child->x1 < (x + width)) && (child->y1 < (y + height)) - && (child->x2 > x) + && (child->x2 > x) && (child->y2 > y))) { cairo_save (cr); @@ -2517,7 +2518,9 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event) /* find the closest item */ if (canvas->root->flags & GNOME_CANVAS_ITEM_VISIBLE) - canvas->new_current_item = gnome_canvas_item_invoke_point (canvas->root, x, y, cx, cy); + canvas->new_current_item = + gnome_canvas_item_invoke_point ( + canvas->root, x, y, cx, cy); else canvas->new_current_item = NULL; } else |