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

Timestamp:

2020-11-07T16:07:22Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

d55ab823

Parents:

fa01c05

Message:

Make fixed layout a UI control and hook it up to the window

File:

• uspace/lib/ui/src/fixed.c (modified) (4 diffs)

uspace/lib/ui/src/fixed.c

@@ -44 +44 @@
 #include "../private/fixed.h"
 
+static void ui_fixed_ctl_destroy(void *);
+static errno_t ui_fixed_ctl_paint(void *);
+static ui_evclaim_t ui_fixed_ctl_pos_event(void *, pos_event_t *);
+
+/** Push button control ops */
+ui_control_ops_t ui_fixed_ops = {
+        .destroy = ui_fixed_ctl_destroy,
+        .paint = ui_fixed_ctl_paint,
+        .pos_event = ui_fixed_ctl_pos_event
+};
+
 /** Create new fixed layout.
  *
@@ -52 +63 @@
 {
         ui_fixed_t *fixed;
+        errno_t rc;
 
         fixed = calloc(1, sizeof(ui_fixed_t));
         if (fixed == NULL)
                 return ENOMEM;
+
+        rc = ui_control_new(&ui_fixed_ops, (void *) fixed, &fixed->control);
+        if (rc != EOK) {
+                free(fixed);
+                return rc;
+        }
 
         list_initialize(&fixed->elem);
@@ -83 +101 @@
         }
 
+        ui_control_delete(fixed->control);
         free(fixed);
+}
+
+/** Get base control from fixed layout.
+ *
+ * @param fixed Fixed layout
+ * @return Control
+ */
+ui_control_t *ui_fixed_ctl(ui_fixed_t *fixed)
+{
+        return fixed->control;
 }
 
@@ -203 +232 @@
 }
 
+/** Destroy fixed layout control.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ */
+void ui_fixed_ctl_destroy(void *arg)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        ui_fixed_destroy(fixed);
+}
+
+/** Paint fixed layout control.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ * @return EOK on success or an error code
+ */
+errno_t ui_fixed_ctl_paint(void *arg)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        return ui_fixed_paint(fixed);
+}
+
+/** Handle fixed layout control position event.
+ *
+ * @param arg Argument (ui_fixed_t *)
+ * @param pos_event Position event
+ * @return @c ui_claimed iff the event is claimed
+ */
+ui_evclaim_t ui_fixed_ctl_pos_event(void *arg, pos_event_t *event)
+{
+        ui_fixed_t *fixed = (ui_fixed_t *) arg;
+
+        return ui_fixed_pos_event(fixed, event);
+}
+
 /** @}
  */