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

Color mixer: Showing simplified fractions, too

Browse source 
Say a color is a mix of 5 red, 4 blue, and 1 black.
It will show "5/10 (1/2) red, 4/10 (2/5) blue, 1/10 black."

Also, when adding multiple contributions of only one color (so far),
it will say, e.g., "entirely (3/3) red".
This commit is contained in:
Bill Kendrick 2022-01-28 02:12:25 -08:00
parent c50fddd604
commit 964416f476
1 changed files with 39 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

47
src/tuxpaint.c
View file

@ -22946,7 +22946,7 @@ static void draw_color_mix_undo_redo(void) {
static void draw_color_mixer_tooltip(void) { static void draw_color_mixer_tooltip(void) {
int i, num_colors_used, tot_count; int i, num_colors_used, tot_count;
char tip_txt[1024]; char tip_txt[1024];
char tip_txt_proportions[NUM_MIXER_COLORS][12]; char tip_txt_proportions[NUM_MIXER_COLORS][64];
int used_colors_color[NUM_MIXER_COLORS], used_colors_amount[NUM_MIXER_COLORS]; int used_colors_color[NUM_MIXER_COLORS], used_colors_amount[NUM_MIXER_COLORS];
num_colors_used = 0; num_colors_used = 0;
@ -22965,18 +22965,49 @@ static void draw_color_mixer_tooltip(void) {
if (num_colors_used == 1) if (num_colors_used == 1)
{ {
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[0], if (used_colors_amount[0] == 1)
/* Color mixer; e.g., "Your color is entirely grey." */ gettext("entirely"), {
gettext(color_mixer_color_names[used_colors_color[0]])); snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[0],
/* Color mixer; e.g., "Your color is entirely grey." */ gettext("entirely"),
gettext(color_mixer_color_names[used_colors_color[0]]));
}
else
{
snprintf(tip_txt_proportions[0], sizeof(tip_txt_proportions[0]),
"%1$s (%2$d/%3$d)",
gettext("entirely"),
used_colors_amount[0], used_colors_amount[0]);
snprintf(tip_txt, sizeof(tip_txt), color_mixer_color_tips[0],
tip_txt_proportions[0],
gettext(color_mixer_color_names[used_colors_color[0]]));
}
} }
else else
{ {
for (i = 0; i < num_colors_used; i++) for (i = 0; i < num_colors_used; i++)
{ {
snprintf(tip_txt_proportions[i], sizeof(tip_txt_proportions[i]), int factor, best_factor;
"%d/%d", used_colors_amount[i], tot_count);
/* FIXME: We could instead (or as well as) show simplified fractions; best_factor = 0;
e.g. for "2/10" show "1/5" or "2/10 (aka 1/5)", perhaps? -bjk 2022.01.27 */ for (factor = 2; factor <= used_colors_amount[i]; factor++)
{
if ((used_colors_amount[i] % factor) == 0 && (tot_count % factor) == 0)
best_factor = factor;
}
if (best_factor)
{
snprintf(tip_txt_proportions[i], sizeof(tip_txt_proportions[i]),
"%d/%d (%d/%d)",
used_colors_amount[i], tot_count,
(int) (used_colors_amount[i] / best_factor), (int) (tot_count / best_factor));
}
else
{
snprintf(tip_txt_proportions[i], sizeof(tip_txt_proportions[i]),
"%d/%d", used_colors_amount[i], tot_count);
}
} }
tip_txt[0] = '\0'; /* Just in case! */ tip_txt[0] = '\0'; /* Just in case! */