Changeset 3583ffb in mainline for uspace/lib/ui/include

Timestamp:

2020-11-08T19:51:04Z (5 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.

Location:

uspace/lib/ui/include/ui

Files:

• label.h (modified) (1 diff)
• pbutton.h (modified) (1 diff)
• wdecor.h (modified) (1 diff)
• window.h (modified) (1 diff)

uspace/lib/ui/include/ui/label.h

@@ -42 +42 @@
 #include <types/ui/control.h>
 #include <types/ui/label.h>
-#include <types/ui/ui.h>
+#include <types/ui/resource.h>
 
-extern errno_t ui_label_create(ui_t *, const char *,
+extern errno_t ui_label_create(ui_resource_t *, const char *,
     ui_label_t **);
 extern void ui_label_destroy(ui_label_t *);

uspace/lib/ui/include/ui/pbutton.h

@@ -43 +43 @@
 #include <types/ui/event.h>
 #include <types/ui/pbutton.h>
-#include <types/ui/ui.h>
+#include <types/ui/resource.h>
 #include <stdbool.h>
 
-extern errno_t ui_pbutton_create(ui_t *, const char *,
+extern errno_t ui_pbutton_create(ui_resource_t *, const char *,
     ui_pbutton_t **);
 extern void ui_pbutton_destroy(ui_pbutton_t *);

uspace/lib/ui/include/ui/wdecor.h

@@ -41 +41 @@
 #include <io/pos_event.h>
 #include <stdbool.h>
-#include <types/ui/ui.h>
+#include <types/ui/resource.h>
 #include <types/ui/wdecor.h>
 
-extern errno_t ui_wdecor_create(ui_t *, const char *,
+extern errno_t ui_wdecor_create(ui_resource_t *, const char *,
     ui_wdecor_t **);
 extern void ui_wdecor_destroy(ui_wdecor_t *);

uspace/lib/ui/include/ui/window.h

@@ -53 +53 @@
 extern void ui_window_add(ui_window_t *, ui_control_t *);
 extern void ui_window_remove(ui_window_t *, ui_control_t *);
+extern ui_resource_t *ui_window_get_res(ui_window_t *);
 extern gfx_context_t *ui_window_get_gc(ui_window_t *);
 extern void ui_window_get_app_rect(ui_window_t *, gfx_rect_t *);