pauljako/yambar
1
0
Fork 0
forked from external/yambar
Code Pull requests Activity

exposable: add a 'width' member, set (at latest) in begin_expose()

Browse source
This commit is contained in:
Daniel Eklöf 2018-12-26 16:37:11 +01:00
parent a745436ee2
commit ce68bdb59d
4 changed files with 26 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

18
particles/string.c
View file

@ -12,7 +12,7 @@ struct private {
};
static int
begin_expose(const struct exposable *exposable, cairo_t *cr)
begin_expose(struct exposable *exposable, cairo_t *cr)
{
const struct private *e = exposable->private;
@ -20,9 +20,11 @@ begin_expose(const struct exposable *exposable, cairo_t *cr)
cairo_text_extents_t extents;
cairo_scaled_font_text_extents(scaled, e->text, &extents);
return (exposable->particle->left_margin +
extents.x_advance +
exposable->particle->right_margin);
exposable->width = (exposable->particle->left_margin +
extents.x_advance +
exposable->particle->right_margin);
return exposable->width;
}
static void
@ -47,12 +49,8 @@ expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
&clusters, &num_clusters, &cluster_flags);
const struct deco *deco = exposable->particle->deco;
if (deco != NULL) {
int width = (exposable->particle->left_margin +
extents.x_advance +
exposable->particle->right_margin);
deco->expose(deco, cr, x, y, width, height);
}
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
cairo_set_source_rgba(cr,
e->foreground.red,