Changeset 12008adf in mainline for uspace/lib/ui

Timestamp:

2020-11-12T10:58:36Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2c9fdeed

Parents:

7a5825b

git-author:

Jiri Svoboda <jiri@…> (2020-11-11 23:58:55)

git-committer:

Jiri Svoboda <jiri@…> (2020-11-12 10:58:36)

Message:

Port barber to UI

Location:

uspace/lib/ui

Files:

• include/ui/image.h (modified) (1 diff)
• src/image.c (modified) (2 diffs)
• test/image.c (modified) (3 diffs)

uspace/lib/ui/include/ui/image.h

@@ -48 +48 @@
 extern void ui_image_destroy(ui_image_t *);
 extern ui_control_t *ui_image_ctl(ui_image_t *);
+extern void ui_image_set_bmp(ui_image_t *, gfx_bitmap_t *, gfx_rect_t *);
 extern void ui_image_set_rect(ui_image_t *, gfx_rect_t *);
 extern errno_t ui_image_paint(ui_image_t *);

uspace/lib/ui/src/image.c

@@ -134 +134 @@
         gfx_coord2_t offs;
 
+        if (image->bitmap == NULL)
+                return EOK;
+
         /*
          * UI image position does not depend on bitmap rectangle p0, so
@@ -149 +152 @@
 }
 
+/** Change image bitmap.
+ *
+ * Note that the caller must have saved the pointer to the previous bitmap
+ * in the image, because this causes it to be unlinked from the image and
+ * not destroyed (the ownership is transferred back to the caller).
+ *
+ * @param image Image
+ * @param bitmap New bitmap (ownership transferred to image) or @c NULL
+ * @param brect New bitmap rectangle
+ */
+void ui_image_set_bmp(ui_image_t *image, gfx_bitmap_t *bitmap,
+    gfx_rect_t *brect)
+{
+        image->bitmap = bitmap;
+        image->brect = *brect;
+}
+
 /** Destroy image control.
  *

uspace/lib/ui/test/image.c

@@ -87 +87 @@
 PCUT_TEST(set_rect)
 {
-
         ui_image_t *image = NULL;
         gfx_rect_t brect;
@@ -107 +106 @@
         PCUT_ASSERT_INT_EQUALS(rect.p1.x, image->rect.p1.x);
         PCUT_ASSERT_INT_EQUALS(rect.p1.y, image->rect.p1.y);
+
+        ui_image_destroy(image);
+}
+
+/** Set image bitmap */
+PCUT_TEST(set_bmp)
+{
+        ui_image_t *image = NULL;
+        gfx_rect_t brect;
+        gfx_rect_t rect;
+        gfx_bitmap_t *bitmap;
+        gfx_bitmap_params_t params;
+        dummy_gc_t *dgc;
+        gfx_context_t *gc;
+        errno_t rc;
+
+        rc = dummygc_create(&dgc);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        gc = dummygc_get_ctx(dgc);
+
+        rc = ui_image_create(NULL, NULL, &brect, &image);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(image);
+
+        rect.p0.x = 1;
+        rect.p0.y = 2;
+        rect.p1.x = 3;
+        rect.p1.y = 4;
+
+        ui_image_set_rect(image, &rect);
+        PCUT_ASSERT_INT_EQUALS(rect.p0.x, image->rect.p0.x);
+        PCUT_ASSERT_INT_EQUALS(rect.p0.y, image->rect.p0.y);
+        PCUT_ASSERT_INT_EQUALS(rect.p1.x, image->rect.p1.x);
+        PCUT_ASSERT_INT_EQUALS(rect.p1.y, image->rect.p1.y);
+
+        gfx_bitmap_params_init(&params);
+        rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_image_set_bmp(image, bitmap, &brect);
+        PCUT_ASSERT_EQUALS(bitmap, image->bitmap);
+
+        rc = ui_image_paint(image);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
         ui_image_destroy(image);
@@ -138 +182 @@
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
+        /* Check that we can paint image after setting bitmap to NULL */
+
+        ui_image_set_bmp(image, NULL, &brect);
+
+        rc = ui_image_paint(image);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
         ui_image_destroy(image);
 }