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

Word wrap button labels on hypens/dashes (-)

Browse source 
e.g. Norwegian Nynorsk "ROGGBIF-regnboge" will appear as

  ROGGBIF-
  regnboge

rather than all crammed on one line and impossible to read.

h/t Karl for the idea.  (Next up: support soft-hyphens)

For https://sourceforge.net/p/tuxpaint/bugs/288/
This commit is contained in:
Bill Kendrick 2024-06-01 20:57:39 -07:00
parent 2183c45d72
commit 217e653d3a
2 changed files with 45 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

6
docs/CHANGES.txt
View file

@ -81,6 +81,12 @@ https://tuxpaint.org/
Closes https://sourceforge.net/p/tuxpaint/feature-requests/229/
Bill Kendrick <bill@newbreedsoftware.com>
* Button labels word-wrap on hyphens/dashes ("-") now too.
TODO And on soft-hyphens.
Closes https://sourceforge.net/p/tuxpaint/bugs/288/
(h/t Karl Ove Hufthammer for suggesting)
Bill Kendrick <bill@newbreedsoftware.com>
* Make screen refresh more snappy on macOS.
Mark Kim <markuskimius@gmail.com>

41
src/tuxpaint.c
View file

@ -9570,11 +9570,14 @@ static SDL_Surface *do_render_button_label(const char *const label)
if (tmp_surf1->w >= button_w * 1.5)
{
int i, found = -1;
char * broken_str;
DEBUG_PRINTF("'%s' is very wide (%d) compared to button size (%d)\n", upstr, tmp_surf1->w, button_w);
if (strstr(upstr, " ") != NULL)
{
int i, found = -1;
/* Try to wrap on a space */
for (i = (strlen(upstr) * 3 / 4); i >= 0 && found == -1; i--)
{
if (upstr[i] == ' ')
@ -9590,6 +9593,40 @@ static SDL_Surface *do_render_button_label(const char *const label)
SDL_FreeSurface(tmp_surf1);
tmp_surf1 = render_text(myfont, upstr, black);
height_mult = 1.5;
}
}
else if (strstr(upstr, "-") != NULL)
{
/* Try to wrap on a visible hyphen/dash */
for (i = (strlen(upstr) - 1); i >= 0 && found == -1; i--)
{
if (upstr[i] == '-')
{
found = i;
}
}
if (found != -1)
{
SDL_FreeSurface(tmp_surf1);
broken_str = alloca(sizeof(wchar_t) * strlen(upstr) + 2);
if (broken_str != NULL) {
for (i = 0; i <= found; i++) {
broken_str[i] = upstr[i];
}
broken_str[i] = '\n';
for (i = found + 1; i < (int) strlen(upstr); i++) {
broken_str[i + 1] = upstr[i];
}
broken_str[i + 1] = '\0';
tmp_surf1 = render_text(myfont, broken_str, black);
} else {
tmp_surf1 = render_text(myfont, upstr, black);
}
height_mult = 1.5;
}
}