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

Timestamp:

2023-11-29T12:39:32Z (5 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, topic/simplify-dev-export

Children:

0e2eee1

Parents:

84d29a2

Message:

It should be 'trough', not 'through', dummy! (thx thepinballroom)

Who said watching a guy making a pinball machine was a waste of time?

File:

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

uspace/lib/ui/src/resource.c

@@ -86 +86 @@
         gfx_color_t *entry_sel_text_fg_color = NULL;
         gfx_color_t *entry_sel_text_bg_color = NULL;
-        gfx_color_t *sbar_through_color = NULL;
-        gfx_color_t *sbar_act_through_color = NULL;
+        gfx_color_t *sbar_trough_color = NULL;
+        gfx_color_t *sbar_act_trough_color = NULL;
         errno_t rc;
 
@@ -221 +221 @@
 
         rc = gfx_color_new_rgb_i16(0xe4e4, 0xe4e4, 0xe4e4,
-            &sbar_through_color);
+            &sbar_trough_color);
         if (rc != EOK)
                 goto error;
 
         rc = gfx_color_new_rgb_i16(0x5858, 0x5858, 0x5858,
-            &sbar_act_through_color);
+            &sbar_act_trough_color);
         if (rc != EOK)
                 goto error;
@@ -265 +265 @@
         resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
 
-        resource->sbar_through_color = sbar_through_color;
-        resource->sbar_act_through_color = sbar_act_through_color;
+        resource->sbar_trough_color = sbar_trough_color;
+        resource->sbar_act_trough_color = sbar_act_trough_color;
 
         *rresource = resource;
@@ -327 +327 @@
                 gfx_color_delete(entry_act_bg_color);
 
-        if (sbar_through_color != NULL)
-                gfx_color_delete(sbar_through_color);
-        if (sbar_act_through_color != NULL)
-                gfx_color_delete(sbar_act_through_color);
+        if (sbar_trough_color != NULL)
+                gfx_color_delete(sbar_trough_color);
+        if (sbar_act_trough_color != NULL)
+                gfx_color_delete(sbar_act_trough_color);
 
         if (tface != NULL)
@@ -376 +376 @@
         gfx_color_t *entry_sel_text_bg_color = NULL;
         gfx_color_t *entry_act_bg_color = NULL;
-        gfx_color_t *sbar_through_color = NULL;
-        gfx_color_t *sbar_act_through_color = NULL;
+        gfx_color_t *sbar_trough_color = NULL;
+        gfx_color_t *sbar_act_trough_color = NULL;
         errno_t rc;
 
@@ -497 +497 @@
                 goto error;
 
-        rc = gfx_color_new_ega(0x07, &sbar_through_color);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_color_new_ega(0x07, &sbar_act_through_color);
+        rc = gfx_color_new_ega(0x07, &sbar_trough_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_color_new_ega(0x07, &sbar_act_trough_color);
         if (rc != EOK)
                 goto error;
@@ -540 +540 @@
         resource->entry_sel_text_bg_color = entry_sel_text_bg_color;
 
-        resource->sbar_through_color = sbar_through_color;
-        resource->sbar_act_through_color = sbar_act_through_color;
+        resource->sbar_trough_color = sbar_trough_color;
+        resource->sbar_act_trough_color = sbar_act_trough_color;
 
         *rresource = resource;
@@ -601 +601 @@
         if (entry_sel_text_bg_color != NULL)
                 gfx_color_delete(entry_sel_text_bg_color);
-        if (sbar_through_color != NULL)
-                gfx_color_delete(sbar_through_color);
-        if (sbar_act_through_color != NULL)
-                gfx_color_delete(sbar_act_through_color);
+        if (sbar_trough_color != NULL)
+                gfx_color_delete(sbar_trough_color);
+        if (sbar_act_trough_color != NULL)
+                gfx_color_delete(sbar_act_trough_color);
 
         if (tface != NULL)
@@ -665 +665 @@
         gfx_color_delete(resource->entry_sel_text_bg_color);
 
-        gfx_color_delete(resource->sbar_through_color);
-        gfx_color_delete(resource->sbar_act_through_color);
+        gfx_color_delete(resource->sbar_trough_color);
+        gfx_color_delete(resource->sbar_act_trough_color);
 
         gfx_font_close(resource->font);