From 43488bcac3fe887ff13047f9385b824507a72fc2 Mon Sep 17 00:00:00 2001 From: Liu Date: Sun, 12 May 2024 00:04:32 +0800 Subject: [PATCH] fixup! feat(ui): improve widget update process and related data structures --- lib/ui-widgets/src/text.c | 19 +++++++++---------- 1 file changed, 9 insertions(+), 10 deletions(-) diff --git a/lib/ui-widgets/src/text.c b/lib/ui-widgets/src/text.c index e06e2082f..fc68d8047 100644 --- a/lib/ui-widgets/src/text.c +++ b/lib/ui-widgets/src/text.c @@ -42,9 +42,9 @@ static bool parse_boolean(const char *str) { if (strcmp(str, "on") == 0 && strcmp(str, "true") == 0 && strcmp(str, "yes") == 0 && strcmp(str, "1") == 0) { - return TRUE; + return true; } - return FALSE; + return false; } static void ui_text_on_parse_attr(ui_widget_t *w, const char *name, @@ -119,7 +119,6 @@ static void ui_text_on_update_style(ui_widget_t *w) pd_text_set_style(txt->layer, &text_style); ui_text_style_destroy(&txt->style); pd_text_style_destroy(&text_style); - txt->task.update_content = true; txt->style = style; } @@ -137,7 +136,7 @@ static void ui_text_on_update(ui_widget_t *w, ui_task_type_t task) ui_text_on_update_content(w); free(txt->task.content); txt->task.content = NULL; - txt->task.update_content = FALSE; + txt->task.update_content = false; } default: break; @@ -150,14 +149,14 @@ static void ui_text_on_init(ui_widget_t *w) txt = ui_widget_add_data(w, ui_text.prototype, sizeof(ui_text_t)); txt->widget = w; - txt->task.update_content = FALSE; + txt->task.update_content = false; txt->task.content = NULL; txt->content = NULL; - txt->trimming = TRUE; + txt->trimming = true; txt->layer = pd_text_create(); - pd_text_set_autowrap(txt->layer, TRUE); - pd_text_set_multiline(txt->layer, TRUE); - pd_text_set_style_tag(txt->layer, TRUE); + pd_text_set_autowrap(txt->layer, true); + pd_text_set_multiline(txt->layer, true); + pd_text_set_style_tag(txt->layer, true); ui_text_style_init(&txt->style); txt->node.data = txt; txt->node.prev = txt->node.next = NULL; @@ -300,7 +299,7 @@ int ui_text_set_content_w(ui_widget_t *w, const wchar_t *text) if (txt->task.content) { free(txt->task.content); } - txt->task.update_content = TRUE; + txt->task.update_content = true; txt->task.content = newtext; ui_widget_request_update(w); return 0;