Changeset 3583ffb in mainline for uspace/lib/ui/src/label.c

Timestamp:

2020-11-08T19:51:04Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f93e4e3

Parents:

8c772c4

Message:

Revert "Create UI controls based on UI object…"

This was a mistake. Controls need ui_resource object, which must be
(at least currently) specific to a window and cannot be obtained from
ui_t.

File:

• uspace/lib/ui/src/label.c (modified) (3 diffs)

uspace/lib/ui/src/label.c

@@ -45 +45 @@
 #include "../private/label.h"
 #include "../private/resource.h"
-#include "../private/ui.h"
 
 static void ui_label_ctl_destroy(void *);
@@ -65 +64 @@
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_label_create(ui_t *ui, const char *text,
+errno_t ui_label_create(ui_resource_t *resource, const char *text,
     ui_label_t **rlabel)
 {
@@ -88 +87 @@
         }
 
-        label->res = ui->resource;
+        label->res = resource;
         label->halign = gfx_halign_left;
         *rlabel = label;