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

app: allow to set an angle on a GimpCanvasHandle in GIMP_HANDLE_CROSS mode

Browse Source
This commit is contained in:
Michael Natterer
2017-06-13 23:16:09 +02:00
parent ad660a3c88
commit 495f90e6e2
1 changed files with 13 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
app/display/gimpcanvashandle.c
View File

@ -309,6 +309,7 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
case GIMP_HANDLE_FILLED_SQUARE: case GIMP_HANDLE_FILLED_SQUARE:
case GIMP_HANDLE_DIAMOND: case GIMP_HANDLE_DIAMOND:
case GIMP_HANDLE_FILLED_DIAMOND: case GIMP_HANDLE_FILLED_DIAMOND:
case GIMP_HANDLE_CROSS:
cairo_save (cr); cairo_save (cr);
cairo_translate (cr, tx, ty); cairo_translate (cr, tx, ty);
cairo_rotate (cr, private->start_angle); cairo_rotate (cr, private->start_angle);
@ -320,10 +321,12 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
cairo_rectangle (cr, x, y, private->width - 1.0, private->height - 1.0); cairo_rectangle (cr, x, y, private->width - 1.0, private->height - 1.0);
_gimp_canvas_item_stroke (item, cr); _gimp_canvas_item_stroke (item, cr);
break; break;
case GIMP_HANDLE_FILLED_SQUARE: case GIMP_HANDLE_FILLED_SQUARE:
cairo_rectangle (cr, x - 0.5, y - 0.5, private->width, private->height); cairo_rectangle (cr, x - 0.5, y - 0.5, private->width, private->height);
_gimp_canvas_item_fill (item, cr); _gimp_canvas_item_fill (item, cr);
break; break;
case GIMP_HANDLE_DIAMOND: case GIMP_HANDLE_DIAMOND:
case GIMP_HANDLE_FILLED_DIAMOND: case GIMP_HANDLE_FILLED_DIAMOND:
cairo_move_to (cr, x, y - (gdouble) private->height / 2.0); cairo_move_to (cr, x, y - (gdouble) private->height / 2.0);
@ -336,9 +339,19 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
else else
_gimp_canvas_item_fill (item, cr); _gimp_canvas_item_fill (item, cr);
break; break;
case GIMP_HANDLE_CROSS:
cairo_move_to (cr, x - private->width / 2, y);
cairo_line_to (cr, x + private->width / 2 - 0.5, y);
cairo_move_to (cr, x, y - private->height / 2);
cairo_line_to (cr, x, y + private->height / 2 - 0.5);
_gimp_canvas_item_stroke (item, cr);
break;
default: default:
g_assert_not_reached (); g_assert_not_reached ();
} }
cairo_restore (cr); cairo_restore (cr);
break; break;
@ -360,16 +373,6 @@ gimp_canvas_handle_draw (GimpCanvasItem *item,
_gimp_canvas_item_fill (item, cr); _gimp_canvas_item_fill (item, cr);
break; break;
case GIMP_HANDLE_CROSS:
cairo_move_to (cr, x - private->width / 2, y);
cairo_line_to (cr, x + private->width / 2 - 0.5, y);
cairo_move_to (cr, x, y - private->height / 2);
cairo_line_to (cr, x, y + private->height / 2 - 0.5);
_gimp_canvas_item_stroke (item, cr);
break;
case GIMP_HANDLE_CROSSHAIR: case GIMP_HANDLE_CROSSHAIR:
cairo_move_to (cr, x - private->width / 2, y); cairo_move_to (cr, x - private->width / 2, y);
cairo_line_to (cr, x - private->width * 0.4, y); cairo_line_to (cr, x - private->width * 0.4, y);