Changeset 307d4d2 in mainline

Timestamp:

2021-08-13T10:57:34Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

297b1b3

Parents:

5e109e1

git-author:

Jiri Svoboda <jiri@…> (2020-08-12 19:55:53)

git-committer:

Jiri Svoboda <jiri@…> (2021-08-13 10:57:34)

Message:

Check box text mode

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (2 diffs)
• lib/ui/private/checkbox.h (modified) (2 diffs)
• lib/ui/src/checkbox.c (modified) (2 diffs)
• lib/ui/test/checkbox.c (modified) (2 diffs)

uspace/app/uidemo/uidemo.c

@@ -229 +229 @@
 }
 
-
 /** File/load menu entry selected.
  *
@@ -717 +716 @@
         ui_checkbox_set_cb(demo.checkbox, &checkbox_cb, (void *) &demo);
 
-        rect.p0.x = 15;
-        rect.p0.y = 190;
-        rect.p1.x = 140;
-        rect.p1.y = 210;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 12;
+                rect.p1.x = 40;
+                rect.p1.y = 13;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 190;
+                rect.p1.x = 140;
+                rect.p1.y = 210;
+        }
         ui_checkbox_set_rect(demo.checkbox, &rect);
 

uspace/lib/ui/private/checkbox.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -66 +66 @@
 };
 
+extern errno_t ui_checkbox_paint_gfx(ui_checkbox_t *);
+extern errno_t ui_checkbox_paint_text(ui_checkbox_t *);
+
 #endif
 

uspace/lib/ui/src/checkbox.c

@@ -146 +146 @@
 }
 
-/** Paint check box.
+/** Paint check box in graphics mode.
  *
  * @param checkbox Check box
  * @return EOK on success or an error code
  */
-errno_t ui_checkbox_paint(ui_checkbox_t *checkbox)
+errno_t ui_checkbox_paint_gfx(ui_checkbox_t *checkbox)
 {
         gfx_coord2_t pos;
@@ -222 +222 @@
 error:
         return rc;
+}
+
+/** Paint check box in text mode.
+ *
+ * @param checkbox Check box
+ * @return EOK on success or an error code
+ */
+errno_t ui_checkbox_paint_text(ui_checkbox_t *checkbox)
+{
+        gfx_coord2_t pos;
+        gfx_text_fmt_t fmt;
+        bool depressed;
+        errno_t rc;
+
+        /* Paint checkbox */
+
+        depressed = checkbox->held && checkbox->inside;
+
+        pos.x = checkbox->rect.p0.x;
+        pos.y = checkbox->rect.p0.y;
+
+        gfx_text_fmt_init(&fmt);
+        fmt.color = depressed ? checkbox->res->entry_act_bg_color :
+            checkbox->res->wnd_text_color;
+        fmt.halign = gfx_halign_left;
+        fmt.valign = gfx_valign_top;
+
+        rc = gfx_puttext(checkbox->res->font, &pos, &fmt,
+            checkbox->checked ? "[X]" : "[ ]");
+        if (rc != EOK)
+                goto error;
+
+        /* Paint checkbox label */
+
+        pos.x += 4;
+        fmt.color = checkbox->res->wnd_text_color;
+
+        rc = gfx_puttext(checkbox->res->font, &pos, &fmt, checkbox->caption);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_update(checkbox->res->gc);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
+/** Paint check box.
+ *
+ * @param checkbox Check box
+ * @return EOK on success or an error code
+ */
+errno_t ui_checkbox_paint(ui_checkbox_t *checkbox)
+{
+        if (checkbox->res->textmode)
+                return ui_checkbox_paint_text(checkbox);
+        else
+                return ui_checkbox_paint_gfx(checkbox);
 }
 

uspace/lib/ui/test/checkbox.c

@@ -151 +151 @@
 }
 
-/** Paint check box */
-PCUT_TEST(paint)
+/** Paint check box in graphics mode */
+PCUT_TEST(paint_gfx)
 {
         errno_t rc;
@@ -171 +171 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
-        rc = ui_checkbox_paint(checkbox);
+        rc = ui_checkbox_paint_gfx(checkbox);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_checkbox_destroy(checkbox);
+        ui_resource_destroy(resource);
+
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Paint check box in text mode */
+PCUT_TEST(paint_text)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        test_gc_t tgc;
+        ui_resource_t *resource = NULL;
+        ui_checkbox_t *checkbox;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, true, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        rc = ui_checkbox_create(resource, "Hello", &checkbox);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_checkbox_paint_text(checkbox);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);