fix(ui): the widgets created in the ready event handler aren't updated

Author: lc-soft

lib/ui-router/tests/test.c

@@ -619,6 +619,7 @@ void test_router_components(void)
 
         ui_event_init(&e, "click");
         ui_widget_emit_event(link_foo, e, NULL);
+        // ui_update();
         matched_widget = ui_router_view_get_matched_widget(view);
         ctest_equal_bool("[/foo] <router-view> widget should load <foo> widget",
                          strcmp(matched_widget->type, "foo") == 0, TRUE);

lib/ui/include/ui/base.h

@@ -78,6 +78,7 @@ LIBUI_PUBLIC void ui_widget_set_disabled(ui_widget_t *w, bool disabled);
 
 // Tree
 
+LIBUI_PUBLIC size_t ui_clear_trash(void);
 LIBUI_PUBLIC void ui_widget_remove(ui_widget_t *w);
 LIBUI_PUBLIC void ui_widget_empty(ui_widget_t *w);
 LIBUI_PUBLIC int ui_widget_append(ui_widget_t *parent, ui_widget_t *widget);
@@ -110,8 +111,7 @@ LIBUI_PUBLIC dict_t *ui_widget_collect_references(ui_widget_t *w);
  * 重置布局相关属性，以让它们在布局时被重新计算
  * @param rule 父级组件所使用的布局规则
  */
-LIBUI_PUBLIC void ui_widget_reset_layout(ui_widget_t *w,
-                                              ui_layout_rule_t rule);
+LIBUI_PUBLIC void ui_widget_reset_layout(ui_widget_t *w, ui_layout_rule_t rule);
 
 LIBUI_PUBLIC void ui_widget_auto_reflow(ui_widget_t *w);
 
@@ -128,7 +128,8 @@ LIBUI_PUBLIC size_t ui_widget_render(ui_widget_t *w, pd_context_t *paint);
 // Updater
 
 LIBUI_PUBLIC size_t ui_widget_update(ui_widget_t *w);
-LIBUI_PUBLIC size_t ui_update(void);
+LIBUI_PUBLIC void ui_update(void);
+
 LIBUI_PUBLIC void ui_refresh_style(void);
 
 LIBUI_PUBLIC void ui_widget_set_rules(ui_widget_t *w,
@@ -150,6 +151,9 @@ LIBUI_INLINE void ui_widget_request_refresh_style(ui_widget_t *w)
 
 LIBUI_INLINE void ui_widget_request_update_style(ui_widget_t *w)
 {
+        if (!w->matched_style) {
+                w->update.should_refresh_style = true;
+        }
         w->update.should_update_style = true;
         ui_widget_request_update(w);
 }

lib/ui/src/ui.c

@@ -12,7 +12,6 @@
 #include <pandagl.h>
 #include <ui/types.h>
 #include "ui/base.h"
-#include "ui_trash.h"
 #include "ui_root.h"
 #include "ui_events.h"
 #include "ui_image.h"
@@ -38,7 +37,7 @@ void ui_init(void)
 void ui_destroy(void)
 {
 	pd_font_library_destroy();
-	ui_trash_clear();
+	ui_clear_trash();
 	ui_destroy_root();
 	ui_destroy_events();
 	ui_destroy_image_loader();

lib/ui/src/ui_trash.c

@@ -18,10 +18,32 @@
 #include <ui/rect.h>
 #include <ui/mutation_observer.h>
 #include "ui_widget_observer.h"
-#include "ui_trash.h"
 
 #define TYPE_CHILD_LIST UI_MUTATION_RECORD_TYPE_CHILD_LIST
 
+static list_t ui_trash = { 0 };
+
+size_t ui_clear_trash(void)
+{
+        list_node_t *node = ui_trash.head.next;
+        size_t count = ui_trash.length;
+
+        while (node) {
+                list_node_t *next = node->next;
+                list_unlink(&ui_trash, node);
+                ui_widget_destroy(node->data);
+                node = next;
+        }
+        return count;
+}
+
+static void ui_trash_add(ui_widget_t *w)
+{
+        w->state = UI_WIDGET_STATE_DELETED;
+        w->parent = NULL;
+        list_append_node(&ui_trash, &w->node);
+}
+
 int ui_widget_append(ui_widget_t *parent, ui_widget_t *widget)
 {
         ui_event_t ev = { 0 };

lib/ui/src/ui_trash.h

@@ -19,9 +19,9 @@
 #include <ui/metrics.h>
 #include <ui/mutation_observer.h>
 #include <ui/hash.h>
+#include <ui/image.h>
 #include "ui_debug.h"
 #include "ui_diff.h"
-#include "ui_trash.h"
 #include "ui_updater.h"
 #include "ui_mutation_observer.h"
 #include "ui_widget_style.h"
@@ -99,7 +99,7 @@ void ui_widget_set_rules(ui_widget_t* w, const ui_widget_rules_t* rules)
         w->extra->default_max_update_count = 2048;
 }
 
-void ui_widget_update_stacking_context(ui_widget_t* w)
+static void ui_widget_update_stacking_context(ui_widget_t* w)
 {
         ui_widget_t *child, *target;
         css_computed_style_t *s, *ts;
@@ -470,23 +470,22 @@ static void ui_process_mutations(ui_widget_t* w)
         w->update.border_box_backup = w->border_box;
 }
 
-size_t ui_update(void)
+void ui_update(void)
 {
-        size_t count;
-        ui_widget_t* root;
-
-        root = ui_root();
+        ui_widget_t *root = ui_root();
         if (memcmp(&ui_metrics, &ui_updater.metrics, sizeof(ui_metrics_t))) {
                 ui_updater.refresh_all = true;
                 root->rendering.dirty_rect_type = UI_DIRTY_RECT_TYPE_FULL;
         }
-        count = ui_widget_update(root);
+        ui_process_image_events();
+        ui_process_events();
+        ui_widget_update(root);
         ui_updater.metrics = ui_metrics;
         ui_updater.refresh_all = false;
         ui_process_mutations(root);
         ui_process_mutation_observers();
-        ui_trash_clear();
-        return count;
+        ui_process_events();
+        ui_clear_trash();
 }
 
 void ui_init_updater(void)

lib/ui/src/ui_tree.c

@@ -113,7 +113,7 @@ void ui_widget_add_state(ui_widget_t* w, ui_widget_state_t state)
 			ui_event_t e = { 0 };
 			e.type = UI_EVENT_READY;
 			e.cancel_bubble = true;
-			ui_widget_emit_event(w, e, NULL);
+			ui_widget_post_event(w, &e, NULL, NULL);
 			w->state = UI_WIDGET_STATE_NORMAL;
 		}
 	}

lib/ui/src/ui_updater.c

@@ -103,7 +103,7 @@ void ui_widget_reflow(ui_widget_t *w)
 #endif
 
 	ui_widget_reflow_with_rule(w, rule);
-	ui_widget_emit_event(w, ev, NULL);
+	ui_widget_post_event(w, &ev, NULL, NULL);
 	ui_widget_add_state(w, UI_WIDGET_STATE_LAYOUTED);
 #ifdef UI_DEBUG_ENABLED
 	{

lib/ui/src/ui_widget.c

@@ -160,10 +160,7 @@ size_t lcui_render_ui(void)
 
 void lcui_update_ui(void)
 {
-        ui_process_image_events();
-        ui_process_events();
         ui_update();
-
 	thread_mutex_lock(&lcui_ui.image_loader.mutex);
         ui_clear_images();
 	thread_mutex_unlock(&lcui_ui.image_loader.mutex);