Changeset de0c55a in mainline for uspace/app/uidemo/uidemo.c

Timestamp:

2021-08-13T22:37:12Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

bc52b5b

Parents:

943f032

Message:

Correctly position moire image in text mode

File:

• uspace/app/uidemo/uidemo.c (modified) (9 diffs)

uspace/app/uidemo/uidemo.c

@@ -673 +673 @@
 
         gfx_bitmap_params_init(&bparams);
-        bparams.rect.p0.x = 0;
-        bparams.rect.p0.y = 0;
-        bparams.rect.p1.x = 188;
-        bparams.rect.p1.y = 24;
+        if (ui_is_textmode(ui)) {
+                bparams.rect.p0.x = 0;
+                bparams.rect.p0.y = 0;
+                bparams.rect.p1.x = 40;
+                bparams.rect.p1.y = 2;
+        } else {
+                bparams.rect.p0.x = 0;
+                bparams.rect.p0.y = 0;
+                bparams.rect.p1.x = 188;
+                bparams.rect.p1.y = 24;
+        }
 
         rc = gfx_bitmap_create(gc, &bparams, NULL, &bitmap);
@@ -692 +699 @@
         }
 
-        off.x = 15;
-        off.y = 155;
+        if (ui_is_textmode(ui)) {
+                off.x = 20;
+                off.y = 10;
+        } else {
+                off.x = 15;
+                off.y = 155;
+        }
+
         gfx_rect_translate(&off, &bparams.rect, &rect);
 
         /* Adjust for frame width (2 x 1 pixel) */
-        rect.p1.x += 2;
-        rect.p1.y += 2;
+        if (!ui_is_textmode(ui)) {
+                ui_image_set_flags(demo.image, ui_imgf_frame);
+                rect.p1.x += 2;
+                rect.p1.y += 2;
+        }
+
         ui_image_set_rect(demo.image, &rect);
-        ui_image_set_flags(demo.image, ui_imgf_frame);
 
         rc = ui_fixed_add(demo.fixed, ui_image_ctl(demo.image));
@@ -719 +735 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 20;
-                rect.p0.y = 12;
+                rect.p0.y = 13;
                 rect.p1.x = 40;
-                rect.p1.y = 13;
+                rect.p1.y = 14;
         } else {
                 rect.p0.x = 15;
@@ -728 +744 @@
                 rect.p1.y = 210;
         }
+
         ui_checkbox_set_rect(demo.checkbox, &rect);
 
@@ -755 +772 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 20;
-                rect.p0.y = 14;
+                rect.p0.y = 15;
                 rect.p1.x = 40;
-                rect.p1.y = 15;
+                rect.p1.y = 16;
         } else {
                 rect.p0.x = 15;
@@ -782 +799 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 20;
-                rect.p0.y = 15;
+                rect.p0.y = 16;
                 rect.p1.x = 40;
-                rect.p1.y = 16;
+                rect.p1.y = 17;
         } else {
                 rect.p0.x = 15;
@@ -810 +827 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 20;
-                rect.p0.y = 16;
+                rect.p0.y = 17;
                 rect.p1.x = 40;
-                rect.p1.y = 17;
+                rect.p1.y = 18;
         } else {
                 rect.p0.x = 15;
@@ -838 +855 @@
         if (ui_is_textmode(ui)) {
                 rect.p0.x = 20;
-                rect.p0.y = 18;
+                rect.p0.y = 19;
                 rect.p1.x = 40;
-                rect.p1.y = 19;
+                rect.p1.y = 20;
         } else {
                 rect.p0.x = 15;
@@ -900 +917 @@
                         k = i * i + j * j;
                         pixelmap_put_pixel(&pixelmap, i, j,
-                            PIXEL(255, k, k, 255 - k));
+                            PIXEL(0, k, k, 255 - k));
                 }
         }