Changeset d70dc1c4 in mainline

Timestamp:

2021-01-06T10:06:42Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

7020d1f

Parents:

e037cf37

git-author:

Jiri Svoboda <jiri@…> (2021-01-05 18:06:37)

git-committer:

Jiri Svoboda <jiri@…> (2021-01-06 10:06:42)

Message:

Check box

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (4 diffs)
• app/uidemo/uidemo.h (modified) (2 diffs)
• lib/ui/include/types/ui/checkbox.h (added)
• lib/ui/include/ui/checkbox.h (added)
• lib/ui/include/ui/paint.h (modified) (1 diff)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/checkbox.h (added)
• lib/ui/private/resource.h (modified) (1 diff)
• lib/ui/src/checkbox.c (added)
• lib/ui/src/entry.c (modified) (2 diffs)
• lib/ui/src/paint.c (modified) (2 diffs)
• lib/ui/src/resource.c (modified) (5 diffs)
• lib/ui/test/checkbox.c (added)
• lib/ui/test/main.c (modified) (1 diff)
• lib/ui/test/paint.c (modified) (2 diffs)

uspace/app/uidemo/uidemo.c

@@ -62 +62 @@
 };
 
+static void checkbox_switched(ui_checkbox_t *, void *, bool);
+
+static ui_checkbox_cb_t checkbox_cb = {
+        .switched = checkbox_switched
+};
+
 /** Window close button was clicked.
  *
@@ -91 +97 @@
         } else {
                 rc = ui_entry_set_text(demo->entry, "Cancel pressed");
+                if (rc != EOK)
+                        printf("Error changing entry text.\n");
+                (void) ui_entry_paint(demo->entry);
+        }
+}
+
+/** Check box was switched.
+ *
+ * @param checkbox Check box
+ * @param arg Argument (demo)
+ */
+static void checkbox_switched(ui_checkbox_t *checkbox, void *arg, bool enable)
+{
+        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");
@@ -124 +153 @@
         params.rect.p0.y = 0;
         params.rect.p1.x = 220;
-        params.rect.p1.y = 180;
+        params.rect.p1.y = 220;
 
         memset((void *) &demo, 0, sizeof(demo));
@@ -258 +287 @@
 
         rc = ui_fixed_add(demo.fixed, ui_image_ctl(demo.image));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_checkbox_create(ui_res, "Check me", &demo.checkbox);
+        if (rc != EOK) {
+                printf("Error creating check box.\n");
+                return rc;
+        }
+
+        ui_checkbox_set_cb(demo.checkbox, &checkbox_cb, (void *) &demo);
+
+        rect.p0.x = 15;
+        rect.p0.y = 180;
+        rect.p1.x = 140;
+        rect.p1.y = 200;
+        ui_checkbox_set_rect(demo.checkbox, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_checkbox_ctl(demo.checkbox));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");

uspace/app/uidemo/uidemo.h

@@ -38 +38 @@
 
 #include <display.h>
+#include <ui/checkbox.h>
 #include <ui/entry.h>
 #include <ui/fixed.h>
@@ -55 +56 @@
         ui_pbutton_t *pb1;
         ui_pbutton_t *pb2;
+        ui_checkbox_t *checkbox;
 } ui_demo_t;
 

uspace/lib/ui/include/ui/paint.h

@@ -40 +40 @@
 #include <gfx/color.h>
 #include <gfx/coord.h>
+#include <types/ui/resource.h>
 
 errno_t ui_paint_bevel(gfx_context_t *, gfx_rect_t *, gfx_color_t *,
     gfx_color_t *, gfx_coord_t, gfx_rect_t *);
+errno_t ui_paint_inset_frame(ui_resource_t *, gfx_rect_t *, gfx_rect_t *);
 
 #endif

uspace/lib/ui/meson.build

@@ -29 +29 @@
 deps = [ 'gfx', 'gfxfont', 'memgfx', 'display' ]
 src = files(
+        'src/checkbox.c',
         'src/control.c',
         'src/dummygc.c',
@@ -44 +45 @@
 
 test_src = files(
+        'test/checkbox.c',
         'test/control.c',
         'test/entry.c',

uspace/lib/ui/private/resource.h

@@ -92 +92 @@
         /** Entry (text entry, checkbox, raido button) background color */
         gfx_color_t *entry_bg_color;
+        /** Entry (text entry, checkbox, raido button) active background color */
+        gfx_color_t *entry_act_bg_color;
 };
 

uspace/lib/ui/src/entry.c

@@ -173 +173 @@
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
-        gfx_rect_t frame;
         gfx_rect_t inside;
         errno_t rc;
@@ -179 +178 @@
         /* Paint inset frame */
 
-        rc = ui_paint_bevel(entry->res->gc, &entry->rect,
-            entry->res->wnd_shadow_color, entry->res->wnd_highlight_color,
-            1, &frame);
-        if (rc != EOK)
-                goto error;
-
-        rc = ui_paint_bevel(entry->res->gc, &frame,
-            entry->res->wnd_frame_sh_color, entry->res->wnd_frame_hi_color,
-            1, &inside);
+        rc = ui_paint_inset_frame(entry->res, &entry->rect, &inside);
         if (rc != EOK)
                 goto error;

uspace/lib/ui/src/paint.c

@@ -39 +39 @@
 #include <gfx/render.h>
 #include <ui/paint.h>
+#include "../private/resource.h"
 
 /** Paint bevel.
@@ -118 +119 @@
 }
 
+/** Paint inset frame.
+ *
+ * @param resource UI resource
+ * @param rect Rectangle to paint onto
+ * @param inside Place to store inside rectangle or @c NULL
+ * @return EOK on success or an error code
+ */
+errno_t ui_paint_inset_frame(ui_resource_t *resource, gfx_rect_t *rect,
+    gfx_rect_t *inside)
+{
+        gfx_rect_t frame;
+        errno_t rc;
+
+        rc = ui_paint_bevel(resource->gc, rect,
+            resource->wnd_shadow_color, resource->wnd_highlight_color,
+            1, &frame);
+        if (rc != EOK)
+                goto error;
+
+        rc = ui_paint_bevel(resource->gc, &frame,
+            resource->wnd_frame_sh_color, resource->wnd_frame_hi_color,
+            1, inside);
+        if (rc != EOK)
+                goto error;
+
+        return EOK;
+error:
+        return rc;
+}
+
 /** @}
  */

uspace/lib/ui/src/resource.c

@@ -76 +76 @@
         gfx_color_t *entry_fg_color = NULL;
         gfx_color_t *entry_bg_color = NULL;
+        gfx_color_t *entry_act_bg_color = NULL;
         errno_t rc;
 
@@ -166 +167 @@
 
         rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &entry_bg_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &entry_act_bg_color);
         if (rc != EOK)
                 goto error;
@@ -193 +198 @@
         resource->entry_fg_color = entry_fg_color;
         resource->entry_bg_color = entry_bg_color;
+        resource->entry_act_bg_color = entry_act_bg_color;
 
         *rresource = resource;
@@ -234 +240 @@
         if (entry_bg_color != NULL)
                 gfx_color_delete(entry_bg_color);
+        if (entry_act_bg_color != NULL)
+                gfx_color_delete(entry_act_bg_color);
 
         if (tface != NULL)
@@ -270 +278 @@
         gfx_color_delete(resource->entry_fg_color);
         gfx_color_delete(resource->entry_bg_color);
+        gfx_color_delete(resource->entry_act_bg_color);
 
         gfx_font_close(resource->font);

uspace/lib/ui/test/main.c

@@ -32 +32 @@
 
 PCUT_IMPORT(control);
+PCUT_IMPORT(checkbox);
 PCUT_IMPORT(entry);
 PCUT_IMPORT(fixed);

uspace/lib/ui/test/paint.c

@@ -33 +33 @@
 #include <stdbool.h>
 #include <ui/paint.h>
+#include <ui/resource.h>
 
 PCUT_INIT;
@@ -103 +104 @@
         gfx_color_delete(color2);
         gfx_color_delete(color1);
+        rc = gfx_context_delete(gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+}
+
+/** Paint inset frame */
+PCUT_TEST(inset_frame)
+{
+        errno_t rc;
+        gfx_context_t *gc = NULL;
+        ui_resource_t *resource = NULL;
+        test_gc_t tgc;
+        gfx_rect_t rect;
+        gfx_rect_t inside;
+
+        memset(&tgc, 0, sizeof(tgc));
+        rc = gfx_context_new(&ops, &tgc, &gc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        rc = ui_resource_create(gc, &resource);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(resource);
+
+        /* Paint inset frame with NULL 'inside' output parameter */
+        rc = ui_paint_inset_frame(resource, &rect, NULL);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        /* Paint inset frame with valid 'inside' output parameter */
+        rc = ui_paint_inset_frame(resource, &rect, &inside);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
         rc = gfx_context_delete(gc);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);