Changeset 7020d1f in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2021-02-01T10:53:48Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f14a900

Parents:

d70dc1c4

git-author:

Jiri Svoboda <jiri@…> (2020-01-31 16:53:25)

git-committer:

Jiri Svoboda <jiri@…> (2021-02-01 10:53:48)

Message:

Radio button

Please don't ask me how I derived the formulae for circle midpoint
algorithm, it's been 8 years and I just don't remember.

File:

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

uspace/app/uidemo/uidemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -68 +68 @@
 };
 
+static void rb_selected(ui_rbutton_group_t *, void *, void *);
+
+static ui_rbutton_group_cb_t rbutton_group_cb = {
+        .selected = rb_selected
+};
+
 /** Window close button was clicked.
  *
@@ -126 +132 @@
 }
 
+/** Radio button was selected.
+ *
+ * @param rbgroup Radio button group
+ * @param garg Group argument (demo)
+ * @param barg Button argument
+ */
+static void rb_selected(ui_rbutton_group_t *rbgroup, void *garg, void *barg)
+{
+        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");
+        (void) ui_entry_paint(demo->entry);
+}
+
 /** Run UI demo on display server. */
 static errno_t ui_demo(const char *display_spec)
@@ -153 +177 @@
         params.rect.p0.y = 0;
         params.rect.p1.x = 220;
-        params.rect.p1.y = 220;
+        params.rect.p1.y = 330;
 
         memset((void *) &demo, 0, sizeof(demo));
@@ -307 +331 @@
 
         rc = ui_fixed_add(demo.fixed, ui_checkbox_ctl(demo.checkbox));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_group_create(ui_res, &demo.rbgroup);
+        if (rc != EOK) {
+                printf("Error creating radio button group.\n");
+                return rc;
+        }
+
+        rc = ui_rbutton_create(demo.rbgroup, "Option 1", (void *) "First",
+            &demo.rb1);
+        if (rc != EOK) {
+                printf("Error creating radio button.\n");
+                return rc;
+        }
+
+        ui_rbutton_group_set_cb(demo.rbgroup, &rbutton_group_cb,
+            (void *) &demo);
+
+        rect.p0.x = 15;
+        rect.p0.y = 210;
+        rect.p1.x = 140;
+        rect.p1.y = 230;
+        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);
+        if (rc != EOK) {
+                printf("Error creating radio button.\n");
+                return rc;
+        }
+
+        rect.p0.x = 15;
+        rect.p0.y = 240;
+        rect.p1.x = 140;
+        rect.p1.y = 260;
+        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);
+        if (rc != EOK) {
+                printf("Error creating radio button.\n");
+                return rc;
+        }
+
+        rect.p0.x = 15;
+        rect.p0.y = 270;
+        rect.p1.x = 140;
+        rect.p1.y = 290;
+        ui_rbutton_set_rect(demo.rb3, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb3));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");