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

app: fix size of outside corner handles

Browse Source
This commit is contained in:
Michael Natterer
2010-09-25 00:02:26 +02:00
parent cbaf997ae2
commit e89650edd9
1 changed files with 20 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
app/display/gimpcanvascorner.c
View File

@ -241,7 +241,9 @@ static void
gimp_canvas_corner_transform (GimpCanvasItem *item, gimp_canvas_corner_transform (GimpCanvasItem *item,
GimpDisplayShell *shell, GimpDisplayShell *shell,
gdouble *x, gdouble *x,
gdouble *y) gdouble *y,
gdouble *w,
gdouble *h)
{ {
GimpCanvasCornerPrivate *private = GET_PRIVATE (item); GimpCanvasCornerPrivate *private = GET_PRIVATE (item);
gdouble rx, ry; gdouble rx, ry;
@ -273,6 +275,9 @@ gimp_canvas_corner_transform (GimpCanvasItem *item,
top_and_bottom_handle_x_offset = (rw - private->corner_width) / 2; top_and_bottom_handle_x_offset = (rw - private->corner_width) / 2;
left_and_right_handle_y_offset = (rh - private->corner_height) / 2; left_and_right_handle_y_offset = (rh - private->corner_height) / 2;
*w = private->corner_width;
*h = private->corner_height;
switch (private->anchor) switch (private->anchor)
{ {
case GTK_ANCHOR_CENTER: case GTK_ANCHOR_CENTER:
@ -335,6 +340,7 @@ gimp_canvas_corner_transform (GimpCanvasItem *item,
{ {
*x = rx; *x = rx;
*y = ry - private->corner_height; *y = ry - private->corner_height;
*w = rw;
} }
else else
{ {
@ -348,6 +354,7 @@ gimp_canvas_corner_transform (GimpCanvasItem *item,
{ {
*x = rx; *x = rx;
*y = ry + rh; *y = ry + rh;
*w = rw;
} }
else else
{ {
@ -361,6 +368,7 @@ gimp_canvas_corner_transform (GimpCanvasItem *item,
{ {
*x = rx - private->corner_width; *x = rx - private->corner_width;
*y = ry; *y = ry;
*h = rh;
} }
else else
{ {
@ -374,6 +382,7 @@ gimp_canvas_corner_transform (GimpCanvasItem *item,
{ {
*x = rx + rw; *x = rx + rw;
*y = ry; *y = ry;
*h = rh;
} }
else else
{ {
@ -389,12 +398,12 @@ gimp_canvas_corner_draw (GimpCanvasItem *item,
GimpDisplayShell *shell, GimpDisplayShell *shell,
cairo_t *cr) cairo_t *cr)
{ {
GimpCanvasCornerPrivate *private = GET_PRIVATE (item); gdouble x, y;
gdouble x, y; gdouble w, h;
gimp_canvas_corner_transform (item, shell, &x, &y); gimp_canvas_corner_transform (item, shell, &x, &y, &w, &h);
cairo_rectangle (cr, x, y, private->corner_width, private->corner_height); cairo_rectangle (cr, x, y, w, h);
_gimp_canvas_item_stroke (item, shell, cr); _gimp_canvas_item_stroke (item, shell, cr);
} }
@ -403,16 +412,16 @@ static GdkRegion *
gimp_canvas_corner_get_extents (GimpCanvasItem *item, gimp_canvas_corner_get_extents (GimpCanvasItem *item,
GimpDisplayShell *shell) GimpDisplayShell *shell)
{ {
GimpCanvasCornerPrivate *private = GET_PRIVATE (item); GdkRectangle rectangle;
GdkRectangle rectangle; gdouble x, y;
gdouble x, y; gdouble w, h;
gimp_canvas_corner_transform (item, shell, &x, &y); gimp_canvas_corner_transform (item, shell, &x, &y, &w, &h);
rectangle.x = floor (x - 1.5); rectangle.x = floor (x - 1.5);
rectangle.y = floor (y - 1.5); rectangle.y = floor (y - 1.5);
rectangle.width = ceil (private->corner_width + 3.0); rectangle.width = ceil (w + 3.0);
rectangle.height = ceil (private->corner_height + 3.0); rectangle.height = ceil (h + 3.0);
return gdk_region_rectangle (&rectangle); return gdk_region_rectangle (&rectangle);
} }