diff --git a/engine/breeze/ui/ui.c b/engine/breeze/ui/ui.c index 255c71f..6d1b053 100644 --- a/engine/breeze/ui/ui.c +++ b/engine/breeze/ui/ui.c @@ -309,19 +309,19 @@ static void renderNode(BzUI *ui, BzUINode *node) { Rectangle rect = getNodeRect(node); - if (node->flags & BZ_UI_WIDGET_DRAW_BACKGROUND) { + if (node->flags & BZ_UI_DRAW_BACKGROUND) { Color color = style->bgColor; if (inter->hovering) color = style->bgHoverColor; if (inter->down) color = style->bgActiveColor; DrawRectangle(rect.x, rect.y, rect.width, rect.height, color); } - if (node->flags & BZ_UI_WIDGET_DRAW_BORDER && style->borderWidth > 0) { + if (node->flags & BZ_UI_DRAW_BORDER && style->borderWidth > 0) { Color color = style->borderColor; if (inter->hovering) color = style->borderHoverColor; if (inter->down) color = style->borderActiveColor; DrawRectangleLinesEx(rect, style->borderWidth, color); } - if (node->flags & BZ_UI_WIDGET_DRAW_TEXT) { + if (node->flags & BZ_UI_DRAW_TEXT) { Color color = style->textColor; if (inter->hovering) color = style->textHoverColor; if (inter->down) color = style->textActiveColor; @@ -389,7 +389,7 @@ BzUINode *bzUIPopParent(BzUI *ui) { } void bzUIPushLayout(BzUI *ui, BzUILayout layout) { - BzUINode *node = bzUINodeMake(ui, ui->idCount++, BZ_UI_WIDGET_NONE); + BzUINode *node = bzUINodeMake(ui, ui->idCount++, BZ_UI_NONE); node->semanticSize[BZ_UI_AXIS_X] = (BzUISize) { .kind = BZ_UI_SIZE_PARENT_PERCENT, .value = 1.0f, @@ -401,7 +401,7 @@ void bzUIPushLayout(BzUI *ui, BzUILayout layout) { } void bzUIPopLayout(BzUI *ui) { BzUINode *last = bzArrayGet(ui->nodeStack, bzArraySize(ui->nodeStack) - 1); - BZ_ASSERT(last->flags == BZ_UI_WIDGET_NONE); + BZ_ASSERT(last->flags == BZ_UI_NONE); bzUIPopParent(ui); } @@ -424,8 +424,8 @@ bool bzUIButton(BzUI *ui, const char *string, BzUIStyle *style) { s = *style; } BzUINode *node = bzUINodeMake(ui, bzUIKeyFromString(string), - BZ_UI_WIDGET_CLICKABLE | BZ_UI_WIDGET_DRAW_TEXT | - BZ_UI_WIDGET_DRAW_BORDER | BZ_UI_WIDGET_ALIGN_CENTER); + BZ_UI_CLICKABLE | BZ_UI_DRAW_TEXT | + BZ_UI_DRAW_BORDER | BZ_UI_ALIGN_CENTER); node->string = string; node->semanticSize[BZ_UI_AXIS_X] = (BzUISize) { .kind = BZ_UI_SIZE_FIT, diff --git a/engine/breeze/ui/ui.h b/engine/breeze/ui/ui.h index c13c79e..5bd6d85 100644 --- a/engine/breeze/ui/ui.h +++ b/engine/breeze/ui/ui.h @@ -74,20 +74,20 @@ typedef enum BzUIAxis { } BzUIAxis; enum { - BZ_UI_WIDGET_NONE = 0, - BZ_UI_WIDGET_CLICKABLE = (1 << 0), - BZ_UI_WIDGET_DRAW_TEXT = (1 << 1), - BZ_UI_WIDGET_DRAW_BORDER = (1 << 2), - BZ_UI_WIDGET_DRAW_BACKGROUND = (1 << 3), - //BZ_UI_WIDGET_DRAW_SPRITE = (1 << 4), - BZ_UI_WIDGET_ALIGN_HORIZ_START = (1 << 5), - BZ_UI_WIDGET_ALIGN_HORIZ_CENTER = (1 << 6), - BZ_UI_WIDGET_ALIGN_HORIZ_END = (1 << 7), - BZ_UI_WIDGET_ALIGN_VERT_START = (1 << 8), - BZ_UI_WIDGET_ALIGN_VERT_CENTER = (1 << 9), - BZ_UI_WIDGET_ALIGN_VERT_END = (1 << 10), + BZ_UI_NONE = 0, + BZ_UI_CLICKABLE = (1 << 0), + BZ_UI_DRAW_TEXT = (1 << 1), + BZ_UI_DRAW_BORDER = (1 << 2), + BZ_UI_DRAW_BACKGROUND = (1 << 3), + //BZ_UI_DRAW_SPRITE = (1 << 4), + BZ_UI_ALIGN_HORIZ_START = (1 << 5), + BZ_UI_ALIGN_HORIZ_CENTER = (1 << 6), + BZ_UI_ALIGN_HORIZ_END = (1 << 7), + BZ_UI_ALIGN_VERT_START = (1 << 8), + BZ_UI_ALIGN_VERT_CENTER = (1 << 9), + BZ_UI_ALIGN_VERT_END = (1 << 10), - BZ_UI_WIDGET_ALIGN_CENTER = BZ_UI_WIDGET_ALIGN_HORIZ_CENTER | BZ_UI_WIDGET_ALIGN_VERT_CENTER, + BZ_UI_ALIGN_CENTER = BZ_UI_ALIGN_HORIZ_CENTER | BZ_UI_ALIGN_VERT_CENTER, };