Changeset 34aad53d in mainline for uspace/app/gfxdemo/gfxdemo.c

Timestamp:

2024-04-07T09:45:45Z (7 months ago)

Author:

Nataliia Korop <n.corop08@…>

Children:

c37c24c

Parents:

e4cc266 (diff), 522eecf (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 master to topic/packet-capture

File:

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

uspace/app/gfxdemo/gfxdemo.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2024 Jiri Svoboda
  * All rights reserved.
  *
@@ -393 +393 @@
                 for (j = 0; j < h; j++) {
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            PIXEL(0, (i % 30) < 3 ? 255 : 0,
+                            PIXEL(255, (i % 30) < 3 ? 255 : 0,
                             (j % 30) < 3 ? 255 : 0, i / 2));
                 }
@@ -429 +429 @@
                         k = i * i + j * j;
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            PIXEL(0, k, k, k));
+                            PIXEL(255, k, k, k));
                 }
         }
@@ -464 +464 @@
                         k = i * i + j * j;
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            k < w * w / 2 ? PIXEL(0, 0, 255, 0) :
-                            PIXEL(0, 255, 0, 255));
+                            k < w * w / 2 ? PIXEL(255, 0, 255, 0) :
+                            PIXEL(255, 255, 0, 255));
                 }
         }
@@ -621 +621 @@
         params.rect.p1.y = 40;
         params.flags = bmpf_color_key;
-        params.key_color = PIXEL(0, 255, 0, 255);
+        params.key_color = PIXEL(255, 255, 0, 255);
 
         rc = gfx_bitmap_create(gc, &params, NULL, &bitmap);
@@ -1160 +1160 @@
          * to rect
          */
-        ui_wdecor_rect_from_app(params.style, &rect, &wrect);
+        ui_wdecor_rect_from_app(ui, params.style, &rect, &wrect);
         off = wrect.p0;
         gfx_rect_rtranslate(&off, &wrect, &params.rect);