notgne2/tuxpaint-pencil-sharpener
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

More appropriately-sized crosshairs on color picker

Browse source 
The corsshairs on the rainbow palette color picker are larger
(by default), and scale up or down based on the UI size
(--buttonsize setting).
This commit is contained in:
Bill Kendrick 2022-03-17 00:36:40 -07:00
parent 8aeb022849
commit 1b9933b7c2
2 changed files with 75 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -7,7 +7,7 @@ Various contributors (see below, and AUTHORS.txt)
http://www.tuxpaint.org/ http://www.tuxpaint.org/
2022.March.16 (0.9.28) 2022.March.17 (0.9.28)
* Improvements to "Paint" and "Lines" tools: * Improvements to "Paint" and "Lines" tools:
------------------------------------------ ------------------------------------------
* Brush spacing may now be altered within Tux Paint. * Brush spacing may now be altered within Tux Paint.
@ -110,6 +110,10 @@ http://www.tuxpaint.org/
Hue/Saturation/Value picker, with the addition of a "value" slider. Hue/Saturation/Value picker, with the addition of a "value" slider.
Bill Kendrick <bill@newbreedsoftware.com> Bill Kendrick <bill@newbreedsoftware.com>
* The crosshairs on the rainbow palette color picker are larger,
and scale up (or down) based on the UI size (--buttonsize setting).
Bill Kendrick <bill@newbreedsoftware.com>
* Show a "pipette"-shaped mouse pointer when selecting a * Show a "pipette"-shaped mouse pointer when selecting a
color from the color palette, or the picture. color from the color palette, or the picture.
Bill Kendrick <bill@newbreedsoftware.com> Bill Kendrick <bill@newbreedsoftware.com>

103
src/tuxpaint.c
View file

@ -22,7 +22,7 @@
Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
(See COPYING.txt) (See COPYING.txt)
June 14, 2002 - March 16, 2022 June 14, 2002 - March 17, 2022
*/ */
#include "platform.h" #include "platform.h"
@ -2095,6 +2095,7 @@ static int do_new_dialog_add_colors(SDL_Surface * *thumbs, int num_files, int *d
char * *d_exts, int *white_in_palette); char * *d_exts, int *white_in_palette);
static int do_color_picker(void); static int do_color_picker(void);
static void draw_color_picker_crosshairs(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top); static void draw_color_picker_crosshairs(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top);
static void set_color_picker_crosshair_size(void);
static void draw_color_picker_values(int l, int t); static void draw_color_picker_values(int l, int t);
static void draw_color_picker_palette_and_values(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top); static void draw_color_picker_palette_and_values(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top);
static void render_color_picker_palette(void); static void render_color_picker_palette(void);
@ -22201,6 +22202,8 @@ static int do_color_picker(void)
/* Hovering over a value from the slider */ /* Hovering over a value from the slider */
do_setcursor(cursor_hand);
y = event.button.y - color_picker_val_top; y = event.button.y - color_picker_val_top;
tmp_color_picker_v = color_picker_v; tmp_color_picker_v = color_picker_v;
color_picker_v = y; color_picker_v = y;
@ -22395,6 +22398,36 @@ static void render_color_picker_palette(void)
} }
/* Length & thickness should be odd numbers, so the
center of the crosshair is positioned precisely */
int CROSSHAIR_LENGTH, CROSSHAIR_THICKNESS, CROSSHAIR_BORDER;
static void set_color_picker_crosshair_size(void) {
CROSSHAIR_LENGTH = (int) (11 * button_scale);
CROSSHAIR_LENGTH /= 2;
CROSSHAIR_LENGTH *= 2;
CROSSHAIR_LENGTH++;
if (CROSSHAIR_LENGTH < 3)
CROSSHAIR_LENGTH = 3;
CROSSHAIR_THICKNESS = (int) (button_scale);
CROSSHAIR_THICKNESS /= 2;
CROSSHAIR_THICKNESS *= 2;
CROSSHAIR_THICKNESS++;
if (CROSSHAIR_THICKNESS < 1)
CROSSHAIR_THICKNESS = 1;
CROSSHAIR_BORDER = CROSSHAIR_THICKNESS / 2;
if (CROSSHAIR_BORDER < 1)
CROSSHAIR_BORDER = 1;
printf("Crosshair will be %d in size, with %d thickness, and a %d border\n",
CROSSHAIR_LENGTH, CROSSHAIR_THICKNESS, CROSSHAIR_BORDER);
}
static void draw_color_picker_crosshairs(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top) static void draw_color_picker_crosshairs(int color_picker_left, int color_picker_top, int color_picker_val_left, int color_picker_val_top)
{ {
SDL_Rect dest; SDL_Rect dest;
@ -22402,64 +22435,67 @@ static void draw_color_picker_crosshairs(int color_picker_left, int color_picker
/* Hue/Saturation (the big rectangle) */ /* Hue/Saturation (the big rectangle) */
dest.x = color_picker_x + color_picker_left - 3; dest.x = color_picker_x + color_picker_left - (CROSSHAIR_LENGTH - 1) / 2 - CROSSHAIR_BORDER;
dest.y = color_picker_y + color_picker_top - 1; dest.y = color_picker_y + color_picker_top - (CROSSHAIR_THICKNESS - 1) / 2 - CROSSHAIR_BORDER;
dest.w = 7; dest.w = CROSSHAIR_LENGTH + CROSSHAIR_BORDER * 2;
dest.h = 3; dest.h = CROSSHAIR_THICKNESS + CROSSHAIR_BORDER * 2;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0));
dest.x = color_picker_x + color_picker_left - 1; dest.x = color_picker_x + color_picker_left - (CROSSHAIR_THICKNESS - 1) / 2 - CROSSHAIR_BORDER;
dest.y = color_picker_y + color_picker_top - 3; dest.y = color_picker_y + color_picker_top - (CROSSHAIR_LENGTH - 1) / 2 - CROSSHAIR_BORDER;
dest.w = 3; dest.w = CROSSHAIR_THICKNESS + CROSSHAIR_BORDER * 2;
dest.h = 7; dest.h = CROSSHAIR_LENGTH + CROSSHAIR_BORDER * 2;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0));
dest.x = color_picker_x + color_picker_left - 2;
dest.y = color_picker_y + color_picker_top; dest.x = color_picker_x + color_picker_left - (CROSSHAIR_LENGTH - 1) / 2;
dest.w = 5; dest.y = color_picker_y + color_picker_top - (CROSSHAIR_THICKNESS - 1) / 2;
dest.h = 1; dest.w = CROSSHAIR_LENGTH;
dest.h = CROSSHAIR_THICKNESS;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255));
dest.x = color_picker_x + color_picker_left; dest.x = color_picker_x + color_picker_left - (CROSSHAIR_THICKNESS - 1) / 2;
dest.y = color_picker_y + color_picker_top - 2; dest.y = color_picker_y + color_picker_top - (CROSSHAIR_LENGTH - 1) / 2;
dest.w = 1; dest.w = CROSSHAIR_THICKNESS;
dest.h = 5; dest.h = CROSSHAIR_LENGTH;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255));
/* Value (the slider) */ /* Value (the slider) */
ctr_x = color_picker_val_left + img_back->w / 2; ctr_x = color_picker_val_left + img_back->w / 2;
dest.x = ctr_x - 3; dest.x = ctr_x - (CROSSHAIR_LENGTH - 1) / 2 - CROSSHAIR_BORDER;
dest.y = color_picker_v + color_picker_val_top - 1; dest.y = color_picker_v + color_picker_val_top - (CROSSHAIR_THICKNESS - 1) / 2 - CROSSHAIR_BORDER;
dest.w = 7; dest.w = CROSSHAIR_LENGTH + CROSSHAIR_BORDER * 2;
dest.h = 3; dest.h = CROSSHAIR_THICKNESS + CROSSHAIR_BORDER * 2;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0));
dest.x = ctr_x - 1; dest.x = ctr_x - (CROSSHAIR_THICKNESS - 1) / 2 - CROSSHAIR_BORDER;
dest.y = color_picker_v + color_picker_val_top - 3; dest.y = color_picker_v + color_picker_val_top - (CROSSHAIR_LENGTH - 1) / 2 - CROSSHAIR_BORDER;
dest.w = 3; dest.w = CROSSHAIR_THICKNESS + CROSSHAIR_BORDER * 2;
dest.h = 7; dest.h = CROSSHAIR_LENGTH + CROSSHAIR_BORDER * 2;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 0, 0, 0));
dest.x = ctr_x - 2;
dest.y = color_picker_v + color_picker_val_top; dest.x = ctr_x - (CROSSHAIR_LENGTH - 1) / 2;
dest.w = 5; dest.y = color_picker_v + color_picker_val_top - (CROSSHAIR_THICKNESS - 1) / 2;
dest.h = 1; dest.w = CROSSHAIR_LENGTH;
dest.h = CROSSHAIR_THICKNESS;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255));
dest.x = ctr_x; dest.x = ctr_x - (CROSSHAIR_THICKNESS - 1) / 2;
dest.y = color_picker_v + color_picker_val_top - 2; dest.y = color_picker_v + color_picker_val_top - (CROSSHAIR_LENGTH - 1) / 2;
dest.w = 1; dest.w = CROSSHAIR_THICKNESS;
dest.h = 5; dest.h = CROSSHAIR_LENGTH;
SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255)); SDL_FillRect(screen, &dest, SDL_MapRGB(screen->format, 255, 255, 255));
} }
@ -26637,6 +26673,7 @@ static void setup(void)
/* (Need to do this after native screen resolution is handled) */ /* (Need to do this after native screen resolution is handled) */
setup_screen_layout(); setup_screen_layout();
set_color_picker_crosshair_size();
/* quickly: title image, version, progress bar, and watch cursor */ /* quickly: title image, version, progress bar, and watch cursor */