Changeset de9992c in mainline for uspace/lib/ui/src/resource.c

Timestamp:

2020-10-16T23:34:55Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1769693

Parents:

8ef48ece

git-author:

Jiri Svoboda <jiri@…> (2020-10-16 23:31:37)

git-committer:

Jiri Svoboda <jiri@…> (2020-10-16 23:34:55)

Message:

Factor out bevel drawing, store button colors in ui_resource_t

File:

• uspace/lib/ui/src/resource.c (modified) (3 diffs)

uspace/lib/ui/src/resource.c

@@ -59 +59 @@
         gfx_font_t *font = NULL;
         gfx_font_info_t *finfo;
+        gfx_color_t *btn_frame_color = NULL;
+        gfx_color_t *btn_face_color = NULL;
+        gfx_color_t *btn_text_color = NULL;
+        gfx_color_t *btn_highlight_color = NULL;
+        gfx_color_t *btn_shadow_color = NULL;
         errno_t rc;
 
@@ -79 +84 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_frame_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xc8c8, 0xc8c8, 0xc8c8, &btn_face_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &btn_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff,
+            &btn_highlight_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0x8888, 0x8888, 0x8888, &btn_shadow_color);
+        if (rc != EOK)
+                goto error;
+
         resource->gc = gc;
         resource->tface = tface;
         resource->font = font;
+        resource->btn_frame_color = btn_frame_color;
+        resource->btn_face_color = btn_face_color;
+        resource->btn_text_color = btn_text_color;
+        resource->btn_highlight_color = btn_highlight_color;
+        resource->btn_shadow_color = btn_shadow_color;
         *rresource = resource;
         return EOK;
 error:
+        if (btn_frame_color != NULL)
+                gfx_color_delete(btn_frame_color);
+        if (btn_face_color != NULL)
+                gfx_color_delete(btn_face_color);
+        if (btn_text_color != NULL)
+                gfx_color_delete(btn_text_color);
+        if (btn_highlight_color != NULL)
+                gfx_color_delete(btn_highlight_color);
+        if (btn_shadow_color != NULL)
+                gfx_color_delete(btn_shadow_color);
         if (tface != NULL)
                 gfx_typeface_destroy(tface);
@@ -100 +141 @@
                 return;
 
+        gfx_color_delete(resource->btn_frame_color);
+        gfx_color_delete(resource->btn_face_color);
+        gfx_color_delete(resource->btn_text_color);
+        gfx_color_delete(resource->btn_highlight_color);
+        gfx_color_delete(resource->btn_shadow_color);
+
         gfx_font_close(resource->font);
         gfx_typeface_destroy(resource->tface);