removed implicit integer

This commit is contained in:
vurtun 2015-07-18 03:47:57 +02:00
parent 6f5c990470
commit 9b9a9f1620
2 changed files with 7 additions and 5 deletions

4
gui.c
View File

@ -4239,7 +4239,7 @@ gui_panel_tree_node(struct gui_tree *tree, enum gui_tree_node_symbol symbol,
if (gui_input_clicked(i, &sym)) { if (gui_input_clicked(i, &sym)) {
if (*state & GUI_NODE_ACTIVE) if (*state & GUI_NODE_ACTIVE)
*state &= ~(gui_flags)GUI_NODE_ACTIVE; *state &= ~(gui_flags)GUI_NODE_ACTIVE;
else *state |= (gui_flags)GUI_NODE_ACTIVE; else *state |= GUI_NODE_ACTIVE;
} }
heading = (*state & GUI_NODE_ACTIVE) ? GUI_DOWN : GUI_RIGHT; heading = (*state & GUI_NODE_ACTIVE) ? GUI_DOWN : GUI_RIGHT;
gui_triangle_from_direction(points, sym.x, sym.y, sym.w, sym.h, 0, 0, heading); gui_triangle_from_direction(points, sym.x, sym.y, sym.w, sym.h, 0, 0, heading);
@ -4254,7 +4254,7 @@ gui_panel_tree_node(struct gui_tree *tree, enum gui_tree_node_symbol symbol,
if (gui_input_clicked(i, &label)) { if (gui_input_clicked(i, &label)) {
if (*state & GUI_NODE_SELECTED) if (*state & GUI_NODE_SELECTED)
*state &= ~(gui_flags)GUI_NODE_SELECTED; *state &= ~(gui_flags)GUI_NODE_SELECTED;
else *state |= (gui_flags)GUI_NODE_SELECTED; else *state |= GUI_NODE_SELECTED;
} }
{ {

8
gui.h
View File

@ -1743,9 +1743,11 @@ struct gui_panel_layout {
/* command draw call output command buffer */ /* command draw call output command buffer */
}; };
#define GUI_NODE_ACTIVE 0x01 enum gui_tree_nodes_states {
#define GUI_NODE_SELECTED 0x02 GUI_NODE_ACTIVE = 0x01,
typedef gui_flag gui_tree_node_state; GUI_NODE_SELECTED = 0x02
};
typedef gui_flags gui_tree_node_state;
enum gui_tree_node_operation { enum gui_tree_node_operation {
GUI_NODE_NOP, GUI_NODE_NOP,