p
/
logdiag
1
1
Fork 0
Code Issues Pull Requests Releases 4 Wiki Activity

Introduce structure LdCanvasRect. 

It's basically the same as cairo_rectangle_t,
just in our own namespace.
This commit is contained in:
Přemysl Eric Janouch 2011-01-06 04:28:56 +01:00
parent 53d1de680d
commit 1704b94650
1 changed files with 40 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

41
src/ld-canvas.c
View File

@ -80,6 +80,8 @@ struct _LdCanvasColor
gdouble a; gdouble a;
}; };
typedef cairo_rectangle_t LdCanvasRect;
/* /*
* LdCanvasPrivate: * LdCanvasPrivate:
* @diagram: A diagram object assigned to this canvas as a model. * @diagram: A diagram object assigned to this canvas as a model.
@ -133,7 +135,7 @@ struct _DrawData
{ {
LdCanvas *self; LdCanvas *self;
cairo_t *cr; cairo_t *cr;
cairo_rectangle_t exposed_rect; LdCanvasRect exposed_rect;
gdouble scale; gdouble scale;
}; };
@ -176,6 +178,12 @@ static void ld_canvas_color_set (LdCanvasColor *color,
gdouble r, gdouble g, gdouble b, gdouble a); gdouble r, gdouble g, gdouble b, gdouble a);
static void ld_canvas_color_apply (LdCanvasColor *color, cairo_t *cr); static void ld_canvas_color_apply (LdCanvasColor *color, cairo_t *cr);
static gboolean ld_canvas_rect_contains (LdCanvasRect *rect,
gdouble x, gdouble y);
static gboolean ld_canvas_rect_intersects (LdCanvasRect *first,
LdCanvasRect *second);
static void ld_canvas_rect_extend (LdCanvasRect *rect, gdouble border);
static void move_object_to_widget_coords (LdCanvas *self, static void move_object_to_widget_coords (LdCanvas *self,
LdDiagramObject *object, gdouble x, gdouble y); LdDiagramObject *object, gdouble x, gdouble y);
static gboolean is_object_in_selection (LdCanvas *self, static gboolean is_object_in_selection (LdCanvas *self,
@ -775,6 +783,37 @@ ld_canvas_color_apply (LdCanvasColor *color, cairo_t *cr)
cairo_set_source_rgba (cr, color->r, color->g, color->b, color->a); cairo_set_source_rgba (cr, color->r, color->g, color->b, color->a);
} }
static gboolean
ld_canvas_rect_contains (LdCanvasRect *rect, gdouble x, gdouble y)
{
g_return_val_if_fail (rect != NULL, FALSE);
return (x >= rect->x && x <= rect->x + rect->width
&& y >= rect->y && y <= rect->y + rect->height);
}
static gboolean
ld_canvas_rect_intersects (LdCanvasRect *first, LdCanvasRect *second)
{
g_return_val_if_fail (first != NULL, FALSE);
g_return_val_if_fail (second != NULL, FALSE);
return !(first->x > second->x + second->width
|| first->y > second->y + second->height
|| first->x + first->width < second->x
|| first->y + first->height < second->y);
}
static void
ld_canvas_rect_extend (LdCanvasRect *rect, gdouble border)
{
g_return_if_fail (rect != NULL);
rect->x -= border;
rect->y -= border;
rect->width += 2 * border;
rect->height += 2 * border;
}
static void static void
move_object_to_widget_coords (LdCanvas *self, LdDiagramObject *object, move_object_to_widget_coords (LdCanvas *self, LdDiagramObject *object,
gdouble x, gdouble y) gdouble x, gdouble y)