Changeset 0d62c10 in mainline for uspace/lib/gfxfont

Timestamp:

2020-10-09T20:27:24Z (5 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f80690a

Parents:

8bf9058

Message:

Rendering text in different colors via colorization

Location:

uspace/lib/gfxfont/src

Files:

• font.c (modified) (3 diffs)
• text.c (modified) (1 diff)

uspace/lib/gfxfont/src/font.c

@@ -122 +122 @@
         gfx_bitmap_params_init(&params);
         params.rect = font->rect;
-        params.flags = bmpf_color_key;
+        params.flags = bmpf_color_key | bmpf_colorize;
         params.key_color = PIXEL(0, 0, 0, 0);
 
@@ -366 +366 @@
         if (nrect->p1.y - nrect->p0.y > params.rect.p1.y)
                 params.rect.p1.y = nrect->p1.y - nrect->p0.y;
-        params.flags = bmpf_color_key;
+        params.flags = bmpf_color_key | bmpf_colorize;
         params.key_color = PIXEL(0, 0, 0, 0);
 
@@ -705 +705 @@
         params.rect.p1.x = width;
         params.rect.p1.y = height;
-        params.flags = bmpf_color_key;
+        params.flags = bmpf_color_key | bmpf_colorize;
         params.key_color = PIXEL(0, 0, 0, 0);
 

uspace/lib/gfxfont/src/text.c

@@ -135 +135 @@
                 case gfx_valign_bottom:
                         cpos.y -= fmetrics.descent;
-                        break;
+                        break;
                 default:
                         break;