Changeset f7c12b3 in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2021-09-03T09:13:46Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

400a16d

Parents:

1ebcb791

git-author:

Jiri Svoboda <jiri@…> (2021-09-02 17:13:31)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-03 09:13:46)

Message:

Fix GFX demo text colors

File:

• uspace/app/gfxdemo/gfxdemo.c (modified) (2 diffs)

uspace/app/gfxdemo/gfxdemo.c

@@ -678 +678 @@
         gfx_color_delete(color);
 
-        rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
-        if (rc != EOK)
-                goto error;
+        if (demo_is_text(w, h)) {
+                rc = gfx_color_new_ega(0x1f, &color);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                rc = gfx_color_new_rgb_i16(0xffff, 0xffff, 0xffff, &color);
+                if (rc != EOK)
+                        goto error;
+        }
 
         gfx_text_fmt_init(&fmt);
@@ -759 +765 @@
         for (i = 0; i < 8; i++) {
                 if (demo_is_text(w, h)) {
-                        rc = gfx_color_new_ega(i, &color);
+                        rc = gfx_color_new_ega(i != 0 ? i : 0x10, &color);
                         if (rc != EOK)
                                 goto error;