aboutsummaryrefslogtreecommitdiffstats
path: root/libgnomecanvas
diff options
context:
space:
mode:
Diffstat (limited to 'libgnomecanvas')
-rw-r--r--libgnomecanvas/gnome-canvas-text.c8
-rw-r--r--libgnomecanvas/gnome-canvas.c11
2 files changed, 13 insertions, 6 deletions
diff --git a/libgnomecanvas/gnome-canvas-text.c b/libgnomecanvas/gnome-canvas-text.c
index b61ce2a25c..adb01548fc 100644
--- a/libgnomecanvas/gnome-canvas-text.c
+++ b/libgnomecanvas/gnome-canvas-text.c
@@ -245,7 +245,8 @@ gnome_canvas_text_class_init (GnomeCanvasTextClass *class)
PROP_FAMILY,
g_param_spec_string ("family",
"Font family",
- "Name of the font family, e.g. Sans, Helvetica, Times, Monospace",
+ "Name of the font family, e.g. "
+ "Sans, Helvetica, Times, Monospace",
NULL,
(G_PARAM_READABLE | G_PARAM_WRITABLE)));
@@ -1174,8 +1175,9 @@ gnome_canvas_text_set_markup (GnomeCanvasText *textitem,
&attr_list, &text, NULL,
&error))
{
- g_warning ("Failed to set cell text from markup due to error parsing markup: %s",
- error->message);
+ g_warning (
+ "Failed to set cell text from markup due to "
+ "error parsing markup: %s", error->message);
g_error_free (error);
return;
}
diff --git a/libgnomecanvas/gnome-canvas.c b/libgnomecanvas/gnome-canvas.c
index bf4f1865be..a0ad066f44 100644
--- a/libgnomecanvas/gnome-canvas.c
+++ b/libgnomecanvas/gnome-canvas.c
@@ -1167,7 +1167,8 @@ gnome_canvas_item_request_update (GnomeCanvasItem *item)
/* Recurse up the tree */
gnome_canvas_item_request_update (item->parent);
} else {
- /* Have reached the top of the tree, make sure the update call gets scheduled. */
+ /* Have reached the top of the tree, make
+ * sure the update call gets scheduled. */
gnome_canvas_request_update (item->canvas);
}
}
@@ -1536,7 +1537,10 @@ gnome_canvas_group_point (GnomeCanvasItem *item,
for (list = g_list_last (group->item_list); list; list = list->prev) {
child = list->data;
- if ((child->x1 > cx) || (child->y1 > cy) || (child->x2 < cx) || (child->y2 < cy))
+ if ((child->x1 > cx) || (child->y1 > cy))
+ continue;
+
+ if ((child->x2 < cx) || (child->y2 < cy))
continue;
if (!(child->flags & GNOME_CANVAS_ITEM_VISIBLE))
@@ -2466,7 +2470,8 @@ pick_current_item (GnomeCanvas *canvas, GdkEvent *event)
* synthesize an enter event.
*/
if (event != &canvas->pick_event) {
- if ((event->type == GDK_MOTION_NOTIFY) || (event->type == GDK_BUTTON_RELEASE)) {
+ if ((event->type == GDK_MOTION_NOTIFY) ||
+ (event->type == GDK_BUTTON_RELEASE)) {
/* these fields have the same offsets in both types of events */
canvas->pick_event.crossing.type = GDK_ENTER_NOTIFY;