perf(gui): use LCUI_STYPE_INT instead of LCUI_STYPE_VALUE

Author: lc-soft

include/LCUI/types.h

@@ -179,16 +179,15 @@ typedef enum LCUI_StyleType {
 	LCUI_STYPE_COLOR,
 	LCUI_STYPE_IMAGE,
 	LCUI_STYPE_STYLE,
-	LCUI_STYPE_VALUE,
+	LCUI_STYPE_INT,
 	LCUI_STYPE_BOOL,
 	LCUI_STYPE_STRING,
 	LCUI_STYPE_WSTRING
 } LCUI_StyleType;
 
 #define LCUI_STYPE_px LCUI_STYPE_PX
 #define LCUI_STYPE_pt LCUI_STYPE_PT
-#define LCUI_STYPE_value LCUI_STYPE_VALUE
-#define LCUI_STYPE_int LCUI_STYPE_VALUE
+#define LCUI_STYPE_int LCUI_STYPE_INT
 #define LCUI_STYPE_color LCUI_STYPE_COLOR
 #define LCUI_STYPE_scale LCUI_STYPE_SCALE
 #define LCUI_STYPE_style LCUI_STYPE_STYLE

src/gui/css_fontstyle.c

@@ -277,7 +277,7 @@ static void OnComputeLineHeight(LCUI_CSSFontStyle fs, LCUI_Style s)
 {
 	int h;
 	if (s->is_valid) {
-		if (s->type == LCUI_STYPE_VALUE) {
+		if (s->type == LCUI_STYPE_INT) {
 			h = iround(fs->font_size * s->val_int);
 		} else if (s->type == LCUI_STYPE_SCALE) {
 			h = iround(fs->font_size * s->val_scale);

src/gui/css_library.c

@@ -1296,7 +1296,7 @@ void LCUI_PrintStyleSheet(LCUI_StyleSheet ss)
 		case LCUI_STYPE_STYLE:
 			LOG("%s", LCUI_GetStyleValueName(s->val_style));
 			break;
-		case LCUI_STYPE_VALUE:
+		case LCUI_STYPE_INT:
 			LOG("%d", s->val_int);
 			break;
 		default:

src/gui/css_parser.c

@@ -134,7 +134,7 @@ static int OnParseValue(LCUI_CSSParserStyleContext ctx, const char *str)
 	LCUI_Style s = &ctx->sheet->sheet[ctx->parser->key];
 	if (sscanf(str, "%d", &s->val_int) == 1) {
 		s->is_valid = TRUE;
-		s->type = LCUI_STYPE_VALUE;
+		s->type = LCUI_STYPE_INT;
 		return 0;
 	}
 	return -1;
@@ -229,7 +229,7 @@ static int OnParseBorder(LCUI_CSSParserStyleContext ctx, const char *str)
 			ss->sheet[key_border_left_color] = slist[i];
 			break;
 		case LCUI_STYPE_PX:
-		case LCUI_STYPE_VALUE:
+		case LCUI_STYPE_INT:
 			ss->sheet[key_border_top_width] = slist[i];
 			ss->sheet[key_border_right_width] = slist[i];
 			ss->sheet[key_border_bottom_width] = slist[i];
@@ -276,7 +276,7 @@ static int OnParseBorderLeft(LCUI_CSSParserStyleContext ctx, const char *str)
 			ss->sheet[key_border_left_color] = slist[i];
 			break;
 		case LCUI_STYPE_PX:
-		case LCUI_STYPE_VALUE:
+		case LCUI_STYPE_INT:
 			ss->sheet[key_border_left_width] = slist[i];
 			break;
 		case LCUI_STYPE_style:
@@ -303,7 +303,7 @@ static int OnParseBorderTop(LCUI_CSSParserStyleContext ctx, const char *str)
 			ss->sheet[key_border_top_color] = slist[i];
 			break;
 		case LCUI_STYPE_PX:
-		case LCUI_STYPE_VALUE:
+		case LCUI_STYPE_INT:
 			ss->sheet[key_border_top_width] = slist[i];
 			break;
 		case LCUI_STYPE_style:
@@ -330,7 +330,7 @@ static int OnParseBorderRight(LCUI_CSSParserStyleContext ctx, const char *str)
 			ss->sheet[key_border_right_color] = slist[i];
 			break;
 		case LCUI_STYPE_PX:
-		case LCUI_STYPE_VALUE:
+		case LCUI_STYPE_INT:
 			ss->sheet[key_border_right_width] = slist[i];
 			break;
 		case LCUI_STYPE_style:
@@ -357,7 +357,7 @@ static int OnParseBorderBottom(LCUI_CSSParserStyleContext ctx, const char *str)
 			ss->sheet[key_border_bottom_color] = slist[i];
 			break;
 		case LCUI_STYPE_PX:
-		case LCUI_STYPE_VALUE:
+		case LCUI_STYPE_INT:
 			ss->sheet[key_border_bottom_width] = slist[i];
 			break;
 		case LCUI_STYPE_style:

src/gui/widget_base.c

@@ -381,8 +381,8 @@ void Widget_UpdateOpacity(LCUI_Widget w)
 	LCUI_Style s = &w->style->sheet[key_opacity];
 	if (s->is_valid) {
 		switch (s->type) {
-		case LCUI_STYPE_VALUE:
-			opacity = 1.0f * s->value;
+		case LCUI_STYPE_INT:
+			opacity = 1.0f * s->val_int;
 			break;
 		case LCUI_STYPE_SCALE:
 			opacity = s->val_scale;
@@ -413,7 +413,7 @@ void Widget_ExecUpdateZIndex(LCUI_Widget w)
 	LinkedList *list;
 	LinkedListNode *cnode, *csnode, *snode;
 	LCUI_Style s = &w->style->sheet[key_z_index];
-	if (s->is_valid && s->type == LCUI_STYPE_VALUE) {
+	if (s->is_valid && s->type == LCUI_STYPE_INT) {
 		z_index = s->val_int;
 	} else {
 		z_index = 0;

src/util/parse.c

@@ -123,7 +123,7 @@ LCUI_BOOL ParseNumber(LCUI_Style s, const char *str)
 			break;
 		}
 		if (1 == sscanf(num_str, "%d", &s->val_int)) {
-			s->type = LCUI_STYPE_VALUE;
+			s->type = LCUI_STYPE_INT;
 			break;
 		}
 	default: