mirrors
/
Nuklear
mirror of https://github.com/Immediate-Mode-UI/Nuklear
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

changed config color pushing

This commit is contained in:
vurtun 2015-05-20 17:35:48 +02:00
parent a7b23dba78
commit ba99ade034
2 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
gui.c
View File

@ -1343,7 +1343,7 @@ gui_config_color(const struct gui_config *config, enum gui_panel_colors index)
void
gui_config_push_color(struct gui_config *config, enum gui_panel_colors index,
struct gui_color color)
gui_byte r, gui_byte g, gui_byte b, gui_byte a)
{
struct gui_saved_color *c;
ASSERT(config);
@ -1352,7 +1352,10 @@ gui_config_push_color(struct gui_config *config, enum gui_panel_colors index,
c = &config->color_stack[config->color++];
c->value = config->colors[index];
c->type = index;
config->colors[index] = color;
config->colors[index].r = r;
config->colors[index].g = g;
config->colors[index].b = b;
config->colors[index].a = a;
}
void
@ -1376,7 +1379,7 @@ gui_config_pop_color(struct gui_config *config)
struct gui_saved_color *c;
ASSERT(config);
if (!config) return;
if (!config->colors) return;
if (!config->color) return;
c = &config->color_stack[--config->color];
config->colors[c->type] = c->value;
}
@ -1387,7 +1390,7 @@ gui_config_pop_property(struct gui_config *config)
struct gui_saved_property *p;
ASSERT(config);
if (!config) return;
if (!config->properties) return;
if (!config->property) return;
p = &config->property_stack[--config->property];
config->properties[p->type] = p->value;
}

3
gui.h
View File

@ -617,7 +617,8 @@ gui_float gui_scroll(const struct gui_canvas*, gui_float x, gui_float y,
void gui_config_default(struct gui_config*);
struct gui_vec2 gui_config_property(const struct gui_config*, enum gui_panel_properties);
struct gui_color gui_config_color(const struct gui_config*, enum gui_panel_colors);
void gui_config_push_color(struct gui_config*, enum gui_panel_colors, struct gui_color);
void gui_config_push_color(struct gui_config*, enum gui_panel_colors,
gui_byte r, gui_byte g, gui_byte b, gui_byte a);
void gui_config_push_property(struct gui_config*, enum gui_panel_properties, gui_float x, gui_float y);
void gui_config_pop_color(struct gui_config*);
void gui_config_pop_property(struct gui_config*);