pos,
&x, &y, &w, &h);
}
- x += ln->x + it->x - it->inset;
+ x += ln->x + it->x;
if (x < ln->x)
{
x = ln->x;
yoff = (it->format->valign * (double)(ln->h - it->h)) + it->baseline; \
if (clip) \
{ \
- if ((obj->cur.geometry.x + x + ln->x + it->x - it->inset + it->w) < (cx - 20)) \
+ if ((obj->cur.geometry.x + x + ln->x + it->x + it->w) < (cx - 20)) \
continue; \
- if ((obj->cur.geometry.x + x + ln->x + it->x - it->inset) > (cx + cw + 20)) \
+ if ((obj->cur.geometry.x + x + ln->x + it->x) > (cx + cw + 20)) \
break; \
}
(obj->cur.cache.clip.a * it->format->color.col.a * (amul)) / 65025);
# define DRAW_TEXT(ox, oy) \
if (it->format->font.font) ENFN->font_draw(output, context, surface, it->format->font.font, \
- obj->cur.geometry.x + ln->x + it->x - it->inset + x + (ox), \
+ obj->cur.geometry.x + ln->x + it->x + x + (ox), \
obj->cur.geometry.y + ln->y + yoff + y + (oy), \
it->w, it->h, it->w, it->h, it->text, &it->bidi_props);
# if 0
last_adv = fg->glyph->advance.x >> 16;
}
if (kern < 0) kern = 0;
- chr_x = (pen_x - kern);
- chr_y = (pen_y);
+ chr_x = (pen_x - kern) + (fg->glyph_out->left);
+ chr_y = (pen_y) + (fg->glyph_out->top);
chr_w = fg->glyph_out->bitmap.width + (kern);
/* if (text[chr]) */
{