Add XOR-line helper when drawing circles and ellipses.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1891 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2012-01-08 14:15:55 +00:00
parent fb6f7f210d
commit bcb0b563ee
2 changed files with 12 additions and 6 deletions

View File

@ -883,10 +883,10 @@ GFX2_GLOBAL T_Brush_template Brush_container[BRUSH_CONTAINER_COLUMNS*BRUSH_CONTA
CURSOR_SHAPE_TARGET , // Centered lines
CURSOR_SHAPE_XOR_TARGET , // Empty rectangle
CURSOR_SHAPE_XOR_TARGET , // Filled rectangle
CURSOR_SHAPE_TARGET , // Empty circle
CURSOR_SHAPE_TARGET , // Filled circle
CURSOR_SHAPE_TARGET , // Empty ellipse
CURSOR_SHAPE_TARGET , // Filled ellipse
CURSOR_SHAPE_XOR_TARGET , // Empty circle
CURSOR_SHAPE_XOR_TARGET , // Filled circle
CURSOR_SHAPE_XOR_TARGET , // Empty ellipse
CURSOR_SHAPE_XOR_TARGET , // Filled ellipse
CURSOR_SHAPE_TARGET , // Fill
CURSOR_SHAPE_TARGET , // Color replacer
CURSOR_SHAPE_XOR_TARGET , // Rectangular brush grabbing
@ -901,8 +901,8 @@ GFX2_GLOBAL T_Brush_template Brush_container[BRUSH_CONTAINER_COLUMNS*BRUSH_CONTA
CURSOR_SHAPE_TARGET , // Filled polygon
CURSOR_SHAPE_TARGET , // Filled polyform
CURSOR_SHAPE_MULTIDIRECTIONAL , // Scroll (pan)
CURSOR_SHAPE_TARGET , // Gradient-filled circle
CURSOR_SHAPE_TARGET , // Gradient-filled ellipse
CURSOR_SHAPE_XOR_TARGET , // Gradient-filled circle
CURSOR_SHAPE_XOR_TARGET , // Gradient-filled ellipse
CURSOR_SHAPE_XOR_ROTATION , // Rotate brush
CURSOR_SHAPE_XOR_TARGET , // Stretch brush
CURSOR_SHAPE_TARGET , // Distort brush

View File

@ -1005,6 +1005,7 @@ void Circle_12_5(void)
if ( (tangent_x!=Paintbrush_X) || (tangent_y!=Paintbrush_Y) )
{
Hide_cursor();
Cursor_shape=CURSOR_SHAPE_TARGET;
if ((Config.Coords_rel) && (Menu_is_visible))
{
Num2str(Distance(center_x,center_y,Paintbrush_X,Paintbrush_Y),str,4);
@ -1178,10 +1179,12 @@ void Ellipse_12_5(void)
Operation_pop(&center_y);
Operation_pop(&center_x);
Operation_pop(&color);
if ( (tangent_x!=Paintbrush_X) || (tangent_y!=Paintbrush_Y) )
{
Hide_cursor();
Cursor_shape=CURSOR_SHAPE_TARGET;
Display_coords_rel_or_abs(center_x,center_y);
horizontal_radius=(tangent_x>center_x)?tangent_x-center_x
@ -2982,9 +2985,11 @@ void Grad_circle_12_6(void)
Operation_pop(&center_x);
Operation_pop(&color);
if ( (tangent_x!=Paintbrush_X) || (tangent_y!=Paintbrush_Y) )
{
Hide_cursor();
Cursor_shape=CURSOR_SHAPE_TARGET;
if ((Config.Coords_rel) && (Menu_is_visible))
{
Num2str(Distance(center_x,center_y,Paintbrush_X,Paintbrush_Y),str,4);
@ -3244,6 +3249,7 @@ void Grad_ellipse_12_6(void)
if ( (tangent_x!=Paintbrush_X) || (tangent_y!=Paintbrush_Y) )
{
Hide_cursor();
Cursor_shape=CURSOR_SHAPE_TARGET;
Display_coords_rel_or_abs(center_x,center_y);
horizontal_radius=(tangent_x>center_x)?tangent_x-center_x