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

Timestamp:

2022-03-07T21:07:02Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

96c6a00

Parents:

4583015

Message:

Rendering UI text with highlighted accelerators

File:

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

uspace/lib/ui/src/resource.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -67 +67 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_color = NULL;
+        gfx_color_t *wnd_sel_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_bg_color = NULL;
         gfx_color_t *wnd_frame_hi_color = NULL;
@@ -131 +133 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_text_hgl_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &wnd_sel_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff,
+            &wnd_sel_text_hgl_color);
         if (rc != EOK)
                 goto error;
@@ -210 +221 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_text_hgl_color = wnd_text_hgl_color;
         resource->wnd_sel_text_color = wnd_sel_text_color;
+        resource->wnd_sel_text_hgl_color = wnd_sel_text_hgl_color;
         resource->wnd_sel_text_bg_color = wnd_sel_text_bg_color;
         resource->wnd_frame_hi_color = wnd_frame_hi_color;
@@ -246 +259 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_text_hgl_color != NULL)
+                gfx_color_delete(wnd_text_hgl_color);
         if (wnd_sel_text_color != NULL)
                 gfx_color_delete(wnd_sel_text_color);
+        if (wnd_sel_text_hgl_color != NULL)
+                gfx_color_delete(wnd_sel_text_hgl_color);
         if (wnd_sel_text_bg_color != NULL)
                 gfx_color_delete(wnd_sel_text_bg_color);
@@ -304 +321 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_color = NULL;
+        gfx_color_t *wnd_sel_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_bg_color = NULL;
         gfx_color_t *wnd_frame_hi_color = NULL;
@@ -362 +381 @@
                 goto error;
 
+        rc = gfx_color_new_ega(0x74, &wnd_text_hgl_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_ega(0x07, &wnd_sel_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x04, &wnd_sel_text_hgl_color);
         if (rc != EOK)
                 goto error;
@@ -435 +462 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_text_hgl_color = wnd_text_hgl_color;
         resource->wnd_sel_text_color = wnd_sel_text_color;
+        resource->wnd_sel_text_hgl_color = wnd_sel_text_hgl_color;
         resource->wnd_sel_text_bg_color = wnd_sel_text_bg_color;
         resource->wnd_frame_hi_color = wnd_frame_hi_color;
@@ -471 +500 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_text_hgl_color != NULL)
+                gfx_color_delete(wnd_text_hgl_color);
         if (wnd_sel_text_color != NULL)
                 gfx_color_delete(wnd_sel_text_color);
+        if (wnd_sel_text_hgl_color != NULL)
+                gfx_color_delete(wnd_sel_text_hgl_color);
         if (wnd_sel_text_bg_color != NULL)
                 gfx_color_delete(wnd_sel_text_bg_color);