diff --git a/src/brush.c b/src/brush.c index 389fe9ba..63014847 100644 --- a/src/brush.c +++ b/src/brush.c @@ -130,6 +130,8 @@ void Display_paintbrush(short x,short y,byte color,byte is_preview) // en train de cliquer switch (Paintbrush_shape) { + case PAINTBRUSH_SHAPE_NONE : // No paintbrush. for colorpicker for example + break; case PAINTBRUSH_SHAPE_POINT : // !!! TOUJOURS EN PREVIEW !!! if ( (Paintbrush_X>=Limit_left) && (Paintbrush_X<=Limit_right) diff --git a/src/buttons.c b/src/buttons.c index 33078df2..8cdb33c9 100644 --- a/src/buttons.c +++ b/src/buttons.c @@ -182,7 +182,7 @@ void Change_paintbrush_shape(byte shape) break; case OPERATION_COLORPICK : Paintbrush_shape_before_colorpicker=shape; - Paintbrush_shape=PAINTBRUSH_SHAPE_POINT; + Paintbrush_shape=PAINTBRUSH_SHAPE_NONE; break; // 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. @@ -3179,7 +3179,7 @@ void Button_Colorpicker(void) Colorpicker_color=-1; Start_operation_stack(OPERATION_COLORPICK); Paintbrush_shape_before_colorpicker=Paintbrush_shape; - Paintbrush_shape=PAINTBRUSH_SHAPE_POINT; + Paintbrush_shape=PAINTBRUSH_SHAPE_NONE; if (Operation_before_interrupt!=OPERATION_REPLACE) if ( (Mouse_Y=Main_X_zoom) ) ) diff --git a/src/const.h b/src/const.h index 9d6d5024..5b146183 100644 --- a/src/const.h +++ b/src/const.h @@ -211,7 +211,8 @@ enum PAINTBRUSH_SHAPES PAINTBRUSH_SHAPE_SIEVE_ROUND, 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_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_MONO_BRUSH, ///< User's brush, in mono mode PAINTBRUSH_SHAPE_MAX ///< Upper limit.