Changeset 8009dc27 in mainline for uspace/app/uidemo/uidemo.c

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

File:

• uspace/app/uidemo/uidemo.c (modified) (7 diffs)

uspace/app/uidemo/uidemo.c

@@ -40 +40 @@
 #include <str.h>
 #include <task.h>
+#include <ui/fixed.h>
 #include <ui/label.h>
 #include <ui/pbutton.h>
@@ -84 +85 @@
 
         /* Make sure we don't process events until fully initialized */
-        if (demo->pb1 == NULL || demo->pb2 == NULL)
+        if (demo->fixed == NULL)
                 return;
 
-        ui_pbutton_pos_event(demo->pb1, event);
-        ui_pbutton_pos_event(demo->pb2, event);
+        ui_fixed_pos_event(demo->fixed, event);
 }
 
@@ -159 +159 @@
         ui_window_get_app_rect(window, &app_rect);
 
+        rc = ui_fixed_create(&demo.fixed);
+        if (rc != EOK) {
+                printf("Error creating fixed layout.\n");
+                return rc;
+        }
+
         rc = ui_label_create(ui_res, "Hello there!", &demo.label);
         if (rc != EOK) {
@@ -172 +178 @@
         ui_label_set_halign(demo.label, gfx_halign_center);
 
+        rc = ui_fixed_add(demo.fixed, ui_label_ctl(demo.label));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
         rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);
         if (rc != EOK) {
@@ -188 +200 @@
         ui_pbutton_set_default(demo.pb1, true);
 
+        rc = ui_fixed_add(demo.fixed, ui_pbutton_ctl(demo.pb1));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
         rc = ui_pbutton_create(ui_res, "Cancel", &demo.pb2);
         if (rc != EOK) {
@@ -202 +220 @@
         ui_pbutton_set_rect(demo.pb2, &rect);
 
+        rc = ui_fixed_add(demo.fixed, ui_pbutton_ctl(demo.pb2));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
         rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &color);
         if (rc != EOK) {
@@ -239 +263 @@
 
         ui_run(ui);
+
+        ui_fixed_remove(demo.fixed, ui_label_ctl(demo.label));
+        ui_fixed_remove(demo.fixed, ui_pbutton_ctl(demo.pb1));
+        ui_fixed_remove(demo.fixed, ui_pbutton_ctl(demo.pb2));
 
         ui_pbutton_destroy(demo.pb1);