Changeset c6f00b40 in mainline for uspace/lib/ui/src/fixed.c

Timestamp:

2020-11-01T22:49:05Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

lfn, master, serial, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

4ac11ff

Parents:

4df6607

git-author:

Jiri Svoboda <jiri@…> (2020-11-01 22:47:03)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-01 22:49:05)

Message:

Add virtual destructor for UI control

File:

• uspace/lib/ui/src/fixed.c (modified) (1 diff)

uspace/lib/ui/src/fixed.c

@@ -68 +68 @@
 void ui_fixed_destroy(ui_fixed_t *fixed)
 {
+        ui_fixed_elem_t *elem;
+        ui_control_t *control;
+
         if (fixed == NULL)
                 return;
 
-        assert(list_empty(&fixed->elem));
+        elem = ui_fixed_first(fixed);
+        while (elem != NULL) {
+                control = elem->control;
+                ui_fixed_remove(fixed, control);
+                ui_control_destroy(control);
+
+                elem = ui_fixed_first(fixed);
+        }
+
         free(fixed);
 }