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

Timestamp:

2023-10-22T17:55:33Z (14 months ago)

Author:

Jiří Zárevúcky <zarevucky.jiri@…>

Branches:

ticket/834-toolchain-update

Children:

350ec74

Parents:

315d487 (diff), 133461c (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.

Message:

Merge branch 'master' into ticket

File:

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

uspace/lib/ui/src/resource.c

@@ -68 +68 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_dis_text_color = NULL;
         gfx_color_t *wnd_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_color = NULL;
@@ -140 +141 @@
                 goto error;
 
+        rc = gfx_color_new_rgb_i16(0x9696, 0x9696, 0x9696, &wnd_dis_text_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_rgb_i16(0, 0, 0, &wnd_text_hgl_color);
         if (rc != EOK)
@@ -239 +244 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_dis_text_color = wnd_dis_text_color;
         resource->wnd_text_hgl_color = wnd_text_hgl_color;
         resource->wnd_sel_text_color = wnd_sel_text_color;
@@ -282 +288 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_dis_text_color != NULL)
+                gfx_color_delete(wnd_dis_text_color);
         if (wnd_text_hgl_color != NULL)
                 gfx_color_delete(wnd_text_hgl_color);
@@ -350 +358 @@
         gfx_color_t *wnd_face_color = NULL;
         gfx_color_t *wnd_text_color = NULL;
+        gfx_color_t *wnd_dis_text_color = NULL;
         gfx_color_t *wnd_text_hgl_color = NULL;
         gfx_color_t *wnd_sel_text_color = NULL;
@@ -416 +425 @@
                 goto error;
 
+        rc = gfx_color_new_ega(0x78, &wnd_dis_text_color);
+        if (rc != EOK)
+                goto error;
+
         rc = gfx_color_new_ega(0x74, &wnd_text_hgl_color);
         if (rc != EOK)
@@ -506 +519 @@
         resource->wnd_face_color = wnd_face_color;
         resource->wnd_text_color = wnd_text_color;
+        resource->wnd_dis_text_color = wnd_dis_text_color;
         resource->wnd_text_hgl_color = wnd_text_hgl_color;
         resource->wnd_sel_text_color = wnd_sel_text_color;
@@ -549 +563 @@
         if (wnd_text_color != NULL)
                 gfx_color_delete(wnd_text_color);
+        if (wnd_dis_text_color != NULL)
+                gfx_color_delete(wnd_dis_text_color);
         if (wnd_text_hgl_color != NULL)
                 gfx_color_delete(wnd_text_hgl_color);
@@ -630 +646 @@
         gfx_color_delete(resource->wnd_face_color);
         gfx_color_delete(resource->wnd_text_color);
+        gfx_color_delete(resource->wnd_dis_text_color);
         gfx_color_delete(resource->wnd_sel_text_color);
         gfx_color_delete(resource->wnd_sel_text_bg_color);