Changeset 4df6607 in mainline for uspace/lib/ui/src

Timestamp:

2020-11-01T18:37:09Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c6f00b40

Parents:

8009dc27

Message:

Paint controls via layout

Location:

uspace/lib/ui/src

Files:

• control.c (modified) (1 diff)
• fixed.c (modified) (1 diff)
• label.c (modified) (2 diffs)
• pbutton.c (modified) (2 diffs)

uspace/lib/ui/src/control.c

@@ -74 +74 @@
 }
 
+/** Paint UI control.
+ *
+ * @param control Push button
+ * @return EOK on success or an error code
+ */
+errno_t ui_control_paint(ui_control_t *control)
+{
+        return control->ops->paint(control->ext);
+}
+
 /** Deliver position event to UI control.
  *

uspace/lib/ui/src/fixed.c

@@ -147 +147 @@
 }
 
+/** Paint fixed layout.
+ *
+ * @param fixed Fixed layout
+ * @return EOK on success or an error code
+ */
+errno_t ui_fixed_paint(ui_fixed_t *fixed)
+{
+        ui_fixed_elem_t *elem;
+        errno_t rc;
+
+        elem = ui_fixed_first(fixed);
+        while (elem != NULL) {
+                rc = ui_control_paint(elem->control);
+                if (rc != EOK)
+                        return rc;
+
+                elem = ui_fixed_next(elem);
+        }
+
+        return EOK;
+}
+
 /** Handle fixed layout position event.
  *

uspace/lib/ui/src/label.c

@@ -46 +46 @@
 #include "../private/resource.h"
 
+static errno_t ui_label_ctl_paint(void *);
 static ui_evclaim_t ui_label_ctl_pos_event(void *, pos_event_t *);
 
 /** Label control ops */
 ui_control_ops_t ui_label_ops = {
+        .paint = ui_label_ctl_paint,
         .pos_event = ui_label_ctl_pos_event
 };
@@ -205 +207 @@
 }
 
+/** Paint lable control.
+ *
+ * @param arg Argument (ui_label_t *)
+ * @return EOK on success or an error code
+ */
+errno_t ui_label_ctl_paint(void *arg)
+{
+        ui_label_t *label = (ui_label_t *) arg;
+
+        return ui_label_paint(label);
+}
+
 /** Handle label control position event.
  *

uspace/lib/ui/src/pbutton.c

@@ -54 +54 @@
 };
 
+static errno_t ui_pbutton_ctl_paint(void *);
 static ui_evclaim_t ui_pbutton_ctl_pos_event(void *, pos_event_t *);
 
 /** Push button control ops */
 ui_control_ops_t ui_pbutton_ops = {
+        .paint = ui_pbutton_ctl_paint,
         .pos_event = ui_pbutton_ctl_pos_event
 };
@@ -416 +418 @@
 }
 
+/** Paint push button control.
+ *
+ * @param arg Argument (ui_pbutton_t *)
+ * @return EOK on success or an error code
+ */
+errno_t ui_pbutton_ctl_paint(void *arg)
+{
+        ui_pbutton_t *pbutton = (ui_pbutton_t *) arg;
+
+        return ui_pbutton_paint(pbutton);
+}
+
 /** Handle push button control position event.
  *