external/yambar
1
0
Fork 1
mirror of https://codeberg.org/dnkl/yambar.git synced 2025-06-16 00:05:40 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

particles: caller of from_conf() must provide base particle instance

Browse source
This commit is contained in:
Daniel Eklöf 2019-01-13 13:25:14 +01:00
parent 770f2a0e7c
commit 7776135454
10 changed files with 107 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

19
particle.h
View file

@ -1,5 +1,4 @@
#pragma once
#include <cairo.h>
#include "color.h"
@ -15,10 +14,7 @@ struct exposable;
struct particle_info {
bool (*verify_conf)(keychain_t *chain, const struct yml_node *node);
struct particle *(*from_conf)(const struct yml_node *node,
const struct font *parent_font,
int left_margin, int right_margin,
const char *on_click_template);
struct particle *(*from_conf)(const struct yml_node *node, struct particle *common);
#define PARTICLE_COMMON_ATTRS_COUNT 5
#define PARTICLE_COMMON_ATTRS \
@ -26,6 +22,8 @@ struct particle_info {
{"left-margin", false, &conf_verify_int}, \
{"right-margin", false, &conf_verify_int}, \
{"on-click", false, &conf_verify_string}, \
{"font", false, &conf_verify_font}, \
{"foreground", false, &conf_verify_color}, \
{"deco", false, &conf_verify_decoration}, \
{NULL, false, NULL}
@ -35,9 +33,12 @@ struct particle {
void *private;
int left_margin, right_margin;
struct deco *deco;
char *on_click_template;
struct rgba foreground;
struct font *font;
struct deco *deco;
void (*destroy)(struct particle *particle);
struct exposable *(*instantiate)(const struct particle *particle,
const struct tag_set *tags);
@ -64,8 +65,10 @@ struct exposable {
enum mouse_event event, int x, int y);
};
struct particle *particle_common_new(int left_margin, int right_margin,
const char *on_click_template);
struct particle *particle_common_new(
int left_margin, int right_margin, const char *on_click_template,
struct font *font, struct rgba foreground, struct deco *deco);
void particle_default_destroy(struct particle *particle);
struct exposable *exposable_common_new(