particle: add utility function to render a particle's decoration

This commit is contained in:
Daniel Eklöf 2018-12-29 21:00:03 +01:00
parent 6f5572ff6b
commit 22507ae26c
8 changed files with 21 additions and 20 deletions

View file

@ -40,6 +40,16 @@ exposable_default_destroy(struct exposable *exposable)
free(exposable);
}
void
exposable_render_deco(const struct exposable *exposable,
cairo_t *cr, int x, int y, int height)
{
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
}
void
exposable_default_on_mouse(struct exposable *exposable, struct bar *bar,
enum mouse_event event, int x, int y)

View file

@ -50,6 +50,9 @@ void particle_default_destroy(struct particle *particle);
struct exposable *exposable_common_new(
const struct particle *particle, const char *on_click);
void exposable_default_destroy(struct exposable *exposable);
void exposable_render_deco(
const struct exposable *exposable, cairo_t *cr, int x, int y, int height);
void exposable_default_on_mouse(
struct exposable *exposable, struct bar *bar,
enum mouse_event event, int x, int y);

View file

@ -13,9 +13,7 @@ begin_expose(struct exposable *exposable, cairo_t *cr)
static void
expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
{
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
exposable_render_deco(exposable, cr, x, y, height);
}
static struct exposable *

View file

@ -56,9 +56,7 @@ expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
{
const struct eprivate *e = exposable->private;
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
exposable_render_deco(exposable, cr, x, y, height);
int left_margin = exposable->particle->left_margin;
int left_spacing = e->left_spacing;

View file

@ -41,11 +41,9 @@ begin_expose(struct exposable *exposable, cairo_t *cr)
static void
expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
{
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
struct eprivate *e = exposable->private;
exposable_render_deco(exposable, cr, x, y, height);
e->exposable->expose(
e->exposable, cr, x + exposable->particle->left_margin, y, height);
}

View file

@ -72,9 +72,7 @@ expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
{
const struct eprivate *e = exposable->private;
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
exposable_render_deco(exposable, cr, x, y, height);
x += exposable->particle->left_margin;
for (size_t i = 0; i < e->count; i++) {

View file

@ -42,11 +42,9 @@ begin_expose(struct exposable *exposable, cairo_t *cr)
static void
expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
{
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
struct eprivate *e = exposable->private;
exposable_render_deco(exposable, cr, x, y, height);
e->exposable->expose(
e->exposable, cr, x + exposable->particle->left_margin, y, height);
}

View file

@ -57,9 +57,7 @@ expose(const struct exposable *exposable, cairo_t *cr, int x, int y, int height)
e->text, strlen(e->text), &glyphs, &num_glyphs,
&clusters, &num_clusters, &cluster_flags);
const struct deco *deco = exposable->particle->deco;
if (deco != NULL)
deco->expose(deco, cr, x, y, exposable->width, height);
exposable_render_deco(exposable, cr, x, y, height);
cairo_set_source_rgba(cr,
e->foreground.red,