m/grafX2
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Introduce a PAINTBRUSH_SHAPE_NONE for the colorpicker.

Browse Source 
git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@1443 416bcca6-2ee7-4201-b75f-2eb2f807beb1
This commit is contained in:
Adrien Destugues 2010-04-05 09:44:57 +00:00
parent befba16697
commit eb14b70724
3 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/brush.c
View File

@ -130,6 +130,8 @@ void Display_paintbrush(short x,short y,byte color,byte is_preview)
// en train de cliquer // en train de cliquer
switch (Paintbrush_shape) switch (Paintbrush_shape)
{ {
case PAINTBRUSH_SHAPE_NONE : // No paintbrush. for colorpicker for example
break;
case PAINTBRUSH_SHAPE_POINT : // !!! TOUJOURS EN PREVIEW !!! case PAINTBRUSH_SHAPE_POINT : // !!! TOUJOURS EN PREVIEW !!!
if ( (Paintbrush_X>=Limit_left) if ( (Paintbrush_X>=Limit_left)
&& (Paintbrush_X<=Limit_right) && (Paintbrush_X<=Limit_right)

4
src/buttons.c
View File

@ -182,7 +182,7 @@ void Change_paintbrush_shape(byte shape)
break; break;
case OPERATION_COLORPICK : case OPERATION_COLORPICK :
Paintbrush_shape_before_colorpicker=shape; Paintbrush_shape_before_colorpicker=shape;
Paintbrush_shape=PAINTBRUSH_SHAPE_POINT; Paintbrush_shape=PAINTBRUSH_SHAPE_NONE;
break; break;
// Note: Il existe un Paintbrush_shape_before_lasso, mais comme le lasso aura // Note: Il existe un Paintbrush_shape_before_lasso, mais comme le lasso aura
// été automatiquement désactivé avant d'arriver ici, y'a pas de problème. // été automatiquement désactivé avant d'arriver ici, y'a pas de problème.
@ -3179,7 +3179,7 @@ void Button_Colorpicker(void)
Colorpicker_color=-1; Colorpicker_color=-1;
Start_operation_stack(OPERATION_COLORPICK); Start_operation_stack(OPERATION_COLORPICK);
Paintbrush_shape_before_colorpicker=Paintbrush_shape; Paintbrush_shape_before_colorpicker=Paintbrush_shape;
Paintbrush_shape=PAINTBRUSH_SHAPE_POINT; Paintbrush_shape=PAINTBRUSH_SHAPE_NONE;
if (Operation_before_interrupt!=OPERATION_REPLACE) if (Operation_before_interrupt!=OPERATION_REPLACE)
if ( (Mouse_Y<Menu_Y) && (Menu_is_visible) && if ( (Mouse_Y<Menu_Y) && (Menu_is_visible) &&
( (!Main_magnifier_mode) || (Mouse_X<Main_separator_position) || (Mouse_X>=Main_X_zoom) ) ) ( (!Main_magnifier_mode) || (Mouse_X<Main_separator_position) || (Mouse_X>=Main_X_zoom) ) )

3
src/const.h
View File

@ -211,7 +211,8 @@ enum PAINTBRUSH_SHAPES
PAINTBRUSH_SHAPE_SIEVE_ROUND, PAINTBRUSH_SHAPE_SIEVE_ROUND,
PAINTBRUSH_SHAPE_SIEVE_SQUARE, PAINTBRUSH_SHAPE_SIEVE_SQUARE,
PAINTBRUSH_SHAPE_MISC, ///< A raw monochrome bitmap, can't be resized. This must be the last of the preset paintbrush types. PAINTBRUSH_SHAPE_MISC, ///< A raw monochrome bitmap, can't be resized. This must be the last of the preset paintbrush types.
PAINTBRUSH_SHAPE_POINT, ///< Used to reduce the paintbrush to a single pixel, during operations like colorpicker. PAINTBRUSH_SHAPE_POINT, ///< Used to reduce the paintbrush to a single pixel, during operations like floodfill.
PAINTBRUSH_SHAPE_NONE, ///< Used to display no cursor at all (colorpicker)
PAINTBRUSH_SHAPE_COLOR_BRUSH, ///< User's brush, in color mode PAINTBRUSH_SHAPE_COLOR_BRUSH, ///< User's brush, in color mode
PAINTBRUSH_SHAPE_MONO_BRUSH, ///< User's brush, in mono mode PAINTBRUSH_SHAPE_MONO_BRUSH, ///< User's brush, in mono mode
PAINTBRUSH_SHAPE_MAX ///< Upper limit. PAINTBRUSH_SHAPE_MAX ///< Upper limit.