Changeset 5de71df in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2021-07-28T18:22:58Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

dbb42c9

Parents:

a106037

Message:

Demonstrate entry alignment and read-only flag

We already have radio buttons and a check box that don't really
do anything useful so we might just use them.

File:

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

uspace/app/uidemo/uidemo.c

@@ -96 +96 @@
 };
 
+/** Horizontal alignment selected by each radio button */
+static const gfx_halign_t uidemo_halign[3] = {
+        gfx_halign_left,
+        gfx_halign_center,
+        gfx_halign_right
+};
+
 /** Window close button was clicked.
  *
@@ -139 +146 @@
 {
         ui_demo_t *demo = (ui_demo_t *) arg;
-        errno_t rc;
-
-        if (enable) {
-                rc = ui_entry_set_text(demo->entry, "Checked");
-                if (rc != EOK)
-                        printf("Error changing entry text.\n");
-                (void) ui_entry_paint(demo->entry);
-        } else {
-                rc = ui_entry_set_text(demo->entry, "Unchecked");
-                if (rc != EOK)
-                        printf("Error changing entry text.\n");
-                (void) ui_entry_paint(demo->entry);
-        }
+
+        ui_entry_set_read_only(demo->entry, enable);
 }
 
@@ -163 +159 @@
 {
         ui_demo_t *demo = (ui_demo_t *) garg;
-        const char *text = (const char *) barg;
-        errno_t rc;
-
-        rc = ui_entry_set_text(demo->entry, text);
-        if (rc != EOK)
-                printf("Error changing entry text.\n");
+        gfx_halign_t halign = *(gfx_halign_t *) barg;
+
+        ui_entry_set_halign(demo->entry, halign);
         (void) ui_entry_paint(demo->entry);
 }
@@ -578 +571 @@
         }
 
-        rc = ui_checkbox_create(ui_res, "Check me", &demo.checkbox);
+        rc = ui_checkbox_create(ui_res, "Read only", &demo.checkbox);
         if (rc != EOK) {
                 printf("Error creating check box.\n");
@@ -604 +597 @@
         }
 
-        rc = ui_rbutton_create(demo.rbgroup, "Option 1", (void *) "First",
-            &demo.rb1);
+        rc = ui_rbutton_create(demo.rbgroup, "Left", (void *) &uidemo_halign[0],
+            &demo.rbleft);
         if (rc != EOK) {
                 printf("Error creating radio button.\n");
@@ -618 +611 @@
         rect.p1.x = 140;
         rect.p1.y = 240;
-        ui_rbutton_set_rect(demo.rb1, &rect);
-
-        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb1));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                return rc;
-        }
-
-        rc = ui_rbutton_create(demo.rbgroup, "Option 2", (void *) "Second",
-            &demo.rb2);
+        ui_rbutton_set_rect(demo.rbleft, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rbleft));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_create(demo.rbgroup, "Center", (void *) &uidemo_halign[1],
+            &demo.rbcenter);
         if (rc != EOK) {
                 printf("Error creating radio button.\n");
@@ -637 +630 @@
         rect.p1.x = 140;
         rect.p1.y = 270;
-        ui_rbutton_set_rect(demo.rb2, &rect);
-
-        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb2));
-        if (rc != EOK) {
-                printf("Error adding control to layout.\n");
-                return rc;
-        }
-
-        rc = ui_rbutton_create(demo.rbgroup, "Option 3", (void *) "Third",
-            &demo.rb3);
+        ui_rbutton_set_rect(demo.rbcenter, &rect);
+        ui_rbutton_select(demo.rbcenter);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rbcenter));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_create(demo.rbgroup, "Right", (void *) &uidemo_halign[2],
+            &demo.rbright);
         if (rc != EOK) {
                 printf("Error creating radio button.\n");
@@ -656 +650 @@
         rect.p1.x = 140;
         rect.p1.y = 300;
-        ui_rbutton_set_rect(demo.rb3, &rect);
-
-        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb3));
+        ui_rbutton_set_rect(demo.rbright, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rbright));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");