Changeset 297b1b3 in mainline

Timestamp:

2021-08-13T15:58:50Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

320abf3

Parents:

307d4d2

Message:

Radio button text mode

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (3 diffs)
• lib/ui/private/rbutton.h (modified) (1 diff)
• lib/ui/src/rbutton.c (modified) (4 diffs)
• lib/ui/test/checkbox.c (modified) (1 diff)
• lib/ui/test/rbutton.c (modified) (2 diffs)

uspace/app/uidemo/uidemo.c

@@ -752 +752 @@
             (void *) &demo);
 
-        rect.p0.x = 15;
-        rect.p0.y = 220;
-        rect.p1.x = 140;
-        rect.p1.y = 240;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 14;
+                rect.p1.x = 40;
+                rect.p1.y = 15;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 220;
+                rect.p1.x = 140;
+                rect.p1.y = 240;
+        }
         ui_rbutton_set_rect(demo.rbleft, &rect);
 
@@ -771 +779 @@
         }
 
-        rect.p0.x = 15;
-        rect.p0.y = 250;
-        rect.p1.x = 140;
-        rect.p1.y = 270;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 15;
+                rect.p1.x = 40;
+                rect.p1.y = 16;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 250;
+                rect.p1.x = 140;
+                rect.p1.y = 270;
+        }
         ui_rbutton_set_rect(demo.rbcenter, &rect);
         ui_rbutton_select(demo.rbcenter);
@@ -791 +807 @@
         }
 
-        rect.p0.x = 15;
-        rect.p0.y = 280;
-        rect.p1.x = 140;
-        rect.p1.y = 300;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 16;
+                rect.p1.x = 40;
+                rect.p1.y = 17;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 280;
+                rect.p1.x = 140;
+                rect.p1.y = 300;
+        }
         ui_rbutton_set_rect(demo.rbright, &rect);
 

uspace/lib/ui/private/rbutton.h

@@ -77 +77 @@
 };
 
+extern errno_t ui_rbutton_paint_gfx(ui_rbutton_t *);
+extern errno_t ui_rbutton_paint_text(ui_rbutton_t *);
+
 #endif
 

uspace/lib/ui/src/rbutton.c

@@ -186 +186 @@
 }
 
-/** Paint radio button.
+/** Paint radio button in graphics mode.
  *
  * @param rbutton Radio button
  * @return EOK on success or an error code
  */
-errno_t ui_rbutton_paint(ui_rbutton_t *rbutton)
+errno_t ui_rbutton_paint_gfx(ui_rbutton_t *rbutton)
 {
         gfx_coord2_t pos;
@@ -202 +202 @@
         center.y = rbutton->rect.p0.y + rbutton_oframe_r;
 
-        /* Paint rbutton frame */
+        /* Paint radio button frame */
 
         rc = gfx_set_color(rbutton->group->res->gc,
@@ -244 +244 @@
                 goto error;
 
-        /* Paint rbutton interior */
+        /* Paint radio button interior */
         depressed = rbutton->held && rbutton->inside;
 
@@ -294 +294 @@
 error:
         return rc;
+}
+
+/** Paint radio button in text mode.
+ *
+ * @param rbutton Radio button
+ * @return EOK on success or an error code
+ */
+errno_t ui_rbutton_paint_text(ui_rbutton_t *rbutton)
+{
+        gfx_coord2_t pos;
+        gfx_text_fmt_t fmt;
+        bool depressed;
+        errno_t rc;
+
+        /* Paint radio button */
+
+        depressed = rbutton->held && rbutton->inside;
+
+        pos.x = rbutton->rect.p0.x;
+        pos.y = rbutton->rect.p0.y;
+
+        gfx_text_fmt_init(&fmt);
+        fmt.color = depressed ? rbutton->group->res->entry_act_bg_color :
+            rbutton->group->res->wnd_text_color;
+        fmt.halign = gfx_halign_left;
+        fmt.valign = gfx_valign_top;
+
+        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
+            rbutton->group->selected == rbutton ? "(*)" : "( )");
+        if (rc != EOK)
+                goto error;
+
+        /* Paint radio button label */
+
+        pos.x += 4;
+
+        gfx_text_fmt_init(&fmt);
+        fmt.color = rbutton->group->res->wnd_text_color;
+        fmt.halign = gfx_halign_left;
+        fmt.valign = gfx_valign_center;
+
+        rc = gfx_puttext(rbutton->group->res->font, &pos, &fmt,
+            rbutton->caption);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_update(rbutton->group->res->gc);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
+/** Paint radio button.
+ *
+ * @param rbutton Radio button
+ * @return EOK on success or an error code
+ */
+errno_t ui_rbutton_paint(ui_rbutton_t *rbutton)
+{
+        if (rbutton->group->res->textmode)
+                return ui_rbutton_paint_text(rbutton);
+        else
+                return ui_rbutton_paint_gfx(rbutton);
 }
 

uspace/lib/ui/test/checkbox.c

@@ -194 +194 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ui_resource_create(gc, true, &resource);
+        rc = ui_resource_create(gc, false, &resource);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(resource);

uspace/lib/ui/test/rbutton.c

@@ -166 +166 @@
 }
 
-/** Paint radio button */
-PCUT_TEST(paint)
+/** Paint radio button in graphics mode */
+PCUT_TEST(paint_gfx)
 {
         errno_t rc;
@@ -190 +190 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ui_rbutton_paint(rbutton);
+        rc = ui_rbutton_paint_gfx(rbutton);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_rbutton_destroy(rbutton);
+        ui_rbutton_group_destroy(group);
+        ui_resource_destroy(resource);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Paint radio button in text mode */
+PCUT_TEST(paint_text)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        test_gc_t tgc;
+        ui_rbutton_group_t *group = NULL;
+        ui_resource_t *resource = NULL;
+        ui_rbutton_t *rbutton;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, false, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        rc = ui_rbutton_group_create(resource, &group);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_rbutton_create(group, "Hello", NULL, &rbutton);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_rbutton_paint_text(rbutton);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);