oreolek/adventin
Archived
1
0
Fork 0
Code Pull requests Releases Activity

bug in layout

Browse source
This commit is contained in:
p.kosyh 2010-01-21 10:44:14 +00:00
parent 5170afce99
commit cbb9d292b8
1 changed files with 7 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
src/sdl-instead/graphics.c
View file

@ -2363,14 +2363,14 @@ void _txt_layout_add(layout_t lay, char *txt)
char *p, *eptr; char *p, *eptr;
char *ptr = txt; char *ptr = txt;
struct xref *xref = NULL; struct xref *xref = NULL;
int w, h, nl = 0; int w, h = 0, nl = 0;
int spw; int spw;
img_t img = NULL; img_t img = NULL;
if (!layout || !layout->fn) if (!layout || !layout->fn)
return; return;
saved_style = layout->style; saved_style = layout->style;
TTF_SetFontStyle((TTF_Font *)(layout->fn), 0); TTF_SetFontStyle((TTF_Font *)(layout->fn), 0);
TTF_SizeUTF8((TTF_Font *)(layout->fn), " ", &spw, &h); TTF_SizeUTF8((TTF_Font *)(layout->fn), " ", &spw, NULL);
for (line = layout->lines; line; line = line->next) { for (line = layout->lines; line; line = line->next) {
lastline = line; lastline = line;
@ -2420,8 +2420,12 @@ void _txt_layout_add(layout_t lay, char *txt)
h = gfx_img_h(img); h = gfx_img_h(img);
} else { } else {
TTF_SizeUTF8((TTF_Font *)(layout->fn), p, &w, &h); TTF_SizeUTF8((TTF_Font *)(layout->fn), p, &w, &h);
if (!*p && line->h)
h = 0;
} }
nl = !*p; nl = !*p;
if (h > line->h)
line->h = h;
if ((line->num && (line->w + ((sp && line->w)?spw:0) + w + addlen) > layout->w) || nl) { if ((line->num && (line->w + ((sp && line->w)?spw:0) + w + addlen) > layout->w) || nl) {
struct line *ol = line; struct line *ol = line;
if ((layout->h) && (line->y + line->h) >= layout->h) if ((layout->h) && (line->y + line->h) >= layout->h)
@ -2437,7 +2441,7 @@ void _txt_layout_add(layout_t lay, char *txt)
goto err; goto err;
} }
line->align = layout->align; line->align = layout->align;
line->h = h; line->h = 0;//h;
line->y = ol->y + ol->h; line->y = ol->y + ol->h;
if (nl) { if (nl) {
ptr = eptr + 1; ptr = eptr + 1;
@ -2447,8 +2451,6 @@ void _txt_layout_add(layout_t lay, char *txt)
line->pos = (int)(ptr - txt); line->pos = (int)(ptr - txt);
continue; continue;
} }
if (h > line->h)
line->h = h;
word = word_new(p); word = word_new(p);
if (!word) { if (!word) {
line_free(line); line_free(line);