Changeset 8009dc27 in mainline for uspace/lib/ui/include

Timestamp:

2020-10-31T01:03:26Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

4df6607

Parents:

f03d1308

Message:

Prototype control base class and fixed layout class

So far only position event delivery is handled via layout

Location:

uspace/lib/ui/include

Files:

• types/ui/control.h (added)
• types/ui/fixed.h (added)
• ui/control.h (added)
• ui/fixed.h (added)
• ui/label.h (modified) (2 diffs)
• ui/pbutton.h (modified) (2 diffs)

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

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <gfx/text.h>
+#include <types/ui/control.h>
 #include <types/ui/label.h>
 #include <types/ui/resource.h>
@@ -46 +47 @@
     ui_label_t **);
 extern void ui_label_destroy(ui_label_t *);
+extern ui_control_t *ui_label_ctl(ui_label_t *);
 extern void ui_label_set_rect(ui_label_t *, gfx_rect_t *);
 extern void ui_label_set_halign(ui_label_t *, gfx_halign_t);

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

@@ -40 +40 @@
 #include <gfx/coord.h>
 #include <io/pos_event.h>
+#include <types/ui/control.h>
 #include <types/ui/event.h>
 #include <types/ui/pbutton.h>
@@ -48 +49 @@
     ui_pbutton_t **);
 extern void ui_pbutton_destroy(ui_pbutton_t *);
+extern ui_control_t *ui_pbutton_ctl(ui_pbutton_t *);
 extern void ui_pbutton_set_cb(ui_pbutton_t *, ui_pbutton_cb_t *, void *);
 extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);