Changeset d8ddf7a in mainline for uspace/lib

Timestamp:

2020-11-22T17:52:37Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2d879f7

Parents:

4f64b7b8

Message:

UI demo should demonstrate image and entry controls

We also add the ability to draw a frame around image control, use
in UI demo and in launcher.

Location:

uspace/lib/ui

Files:

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

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

@@ -40 +40 @@
 typedef struct ui_image ui_image_t;
 
+/** UI image flags */
+typedef enum {
+        /** Draw a frame around the image */
+        ui_imgf_frame = 0x1
+} ui_image_flags_t;
+
 #endif
 

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

@@ -50 +50 @@
 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 void ui_image_set_flags(ui_image_t *, ui_image_flags_t);
 extern errno_t ui_image_paint(ui_image_t *);
 

uspace/lib/ui/private/image.h

@@ -52 +52 @@
         /** Image rectangle */
         gfx_rect_t rect;
+        /** Flags */
+        ui_image_flags_t flags;
         /** Bitmap */
         gfx_bitmap_t *bitmap;
+        /** Bitmap rectangle */
         gfx_rect_t brect;
 };

uspace/lib/ui/src/image.c

@@ -124 +124 @@
 }
 
+/** Set image flags.
+ *
+ * @param image Image
+ * @param flags Flags
+ */
+void ui_image_set_flags(ui_image_t *image, ui_image_flags_t flags)
+{
+        image->flags = flags;
+}
+
 /** Paint image.
  *
@@ -131 +141 @@
 errno_t ui_image_paint(ui_image_t *image)
 {
+        gfx_rect_t irect;
         gfx_rect_t srect;
         gfx_coord2_t offs;
+        errno_t rc;
+
+        if ((image->flags & ui_imgf_frame) != 0) {
+                rc = ui_paint_bevel(image->res->gc, &image->rect,
+                    image->res->btn_frame_color, image->res->btn_frame_color,
+                    1, NULL);
+                if (rc != EOK)
+                        return rc;
+        }
 
         if (image->bitmap == NULL)
                 return EOK;
+
+        irect = image->rect;
+        if ((image->flags & ui_imgf_frame) != 0) {
+                irect.p0.x++;
+                irect.p0.y++;
+                irect.p1.x--;
+                irect.p1.y--;
+        }
 
         /*
@@ -141 +169 @@
          * we need to subtract it.
          */
-        offs.x = image->rect.p0.x - image->brect.p0.x;
-        offs.y = image->rect.p0.y - image->brect.p0.y;
+        offs.x = irect.p0.x - image->brect.p0.x;
+        offs.y = irect.p0.y - image->brect.p0.y;
 
         /*
-         * Transalte image rectangle back to bitmap coordinate space.
+         * Translate image rectangle back to bitmap coordinate space.
          * Thus the bitmap will be clipped to the image rectangle.
          */
-        gfx_rect_rtranslate(&offs, &image->rect, &srect);
+        gfx_rect_rtranslate(&offs, &irect, &srect);
         return gfx_bitmap_render(image->bitmap, &srect, &offs);
+
 }
 

uspace/lib/ui/test/image.c

@@ -110 +110 @@
 }
 
+/** Set image flags sets internal field */
+PCUT_TEST(set_flags)
+{
+        ui_image_t *image = NULL;
+        gfx_rect_t brect;
+        errno_t rc;
+
+        rc = ui_image_create(NULL, NULL, &brect, &image);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+        PCUT_ASSERT_NOT_NULL(image);
+
+        PCUT_ASSERT_INT_EQUALS(0, image->flags);
+
+        ui_image_set_flags(image, ui_imgf_frame);
+        PCUT_ASSERT_INT_EQUALS(ui_imgf_frame, image->flags);
+
+        ui_image_destroy(image);
+}
+
 /** Set image bitmap */
 PCUT_TEST(set_bmp)