perf(gui): improve Widget_Empty() performance

lc-soft · Mar 4, 2019 · 1654963 · 1654963
1 parent 1df08b6
commit 1654963
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 13 deletions.
diff --git a/src/gui/widget_base.c b/src/gui/widget_base.c
@@ -208,23 +208,32 @@ void Widget_Destroy(LCUI_Widget w)
 void Widget_Empty(LCUI_Widget w)
 {
 	LCUI_Widget root = w;
+	LCUI_Widget child;
+	LinkedListNode *node;
+	LCUI_WidgetEventRec ev;
 
 	while (root->parent) {
 		root = root->parent;
 	}
-	if (root == LCUIWidget.root) {
-		LinkedListNode *next, *node;
-		node = w->children.head.next;
-		while (node) {
-			next = node->next;
-			Widget_AddToTrash(node->data);
-			node = next;
-		}
-		Widget_InvalidateArea(w, NULL, SV_GRAPH_BOX);
-		Widget_AddTask(w, LCUI_WTASK_LAYOUT);
-	} else {
+	if (root != LCUIWidget.root) {
 		Widget_DestroyChildren(w);
+		return;
+	}
+	LCUI_InitWidgetEvent(&ev, "unlink");
+	for (LinkedList_Each(node, &w->children)) {
+		child = node->data;
+		Widget_TriggerEvent(child, &ev, NULL);
+		if (child->parent == root) {
+			Widget_PostSurfaceEvent(child, LCUI_WEVENT_UNLINK,
+						TRUE);
+		}
+		child->state = LCUI_WSTATE_DELETED;
+		child->parent = NULL;
 	}
+	LinkedList_ClearData(&w->children_show, NULL);
+	LinkedList_Concat(&LCUIWidget.trash, &w->children);
+	Widget_InvalidateArea(w, NULL, SV_GRAPH_BOX);
+	Widget_AddTask(w, LCUI_WTASK_LAYOUT);
 }
 
 void Widget_GetOffset(LCUI_Widget w, LCUI_Widget parent, float *offset_x,

diff --git a/src/gui/widget_class.c b/src/gui/widget_class.c
@@ -56,7 +56,7 @@ static int Widget_HandleClassesChange(LCUI_Widget w, const char *name)
 	}
 	/* If widget is not ready, indicate that the style of the children has
 	 * been marked needs to be refreshed */
-	if (w->state < LCUI_WSTATE_READY) {
+	if (w->state < LCUI_WSTATE_READY || w->state == LCUI_WSTATE_DELETED) {
 		return 1;
 	}
 	if (Widget_GetChildrenStyleChanges(w, 0, name) > 0) {

diff --git a/src/gui/widget_status.c b/src/gui/widget_status.c
@@ -52,7 +52,7 @@ static void Widget_MarkChildrenRefreshByStatus(LCUI_Widget w)
 static int Widget_HandleStatusChange(LCUI_Widget w, const char *name)
 {
 	Widget_UpdateStyle(w, TRUE);
-	if (w->state < LCUI_WSTATE_READY) {
+	if (w->state < LCUI_WSTATE_READY || w->state == LCUI_WSTATE_DELETED) {
 		return 1;
 	}
 	if (w->rules && w->rules->ignore_status_change) {

diff --git a/src/gui/widget_tree.c b/src/gui/widget_tree.c
@@ -167,6 +167,7 @@ int Widget_Unlink(LCUI_Widget widget)
 	LCUI_Widget child;
 	LCUI_WidgetEventRec ev = { 0 };
 	LinkedListNode *node, *snode;
+
 	if (!widget->parent) {
 		return -1;
 	}