Changeset a977e37 in mainline

Timestamp:

2021-06-23T09:52:22Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

37d0dd4, ec16831

Parents:

7481ee19

git-author:

Jiri Svoboda <jiri@…> (2021-06-22 17:51:57)

git-committer:

Jiri Svoboda <jiri@…> (2021-06-23 09:52:22)

Message:

Make more of UI demo visible in text mode

So that we can test text entry.

File:

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

uspace/app/uidemo/uidemo.c

@@ -433 +433 @@
         }
 
-        rect.p0.x = 15;
-        rect.p0.y = 53;
-        rect.p1.x = 205;
-        rect.p1.y = 78;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 4;
+                rect.p1.x = 60;
+                rect.p1.y = 5;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 53;
+                rect.p1.x = 205;
+                rect.p1.y = 78;
+        }
+
         ui_entry_set_rect(demo.entry, &rect);
         ui_entry_set_halign(demo.entry, gfx_halign_center);
@@ -452 +461 @@
         }
 
-        rect.p0.x = 60;
-        rect.p0.y = 88;
-        rect.p1.x = 160;
-        rect.p1.y = 101;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 6;
+                rect.p1.x = 60;
+                rect.p1.y = 7;
+        } else {
+                rect.p0.x = 60;
+                rect.p0.y = 88;
+                rect.p1.x = 160;
+                rect.p1.y = 101;
+        }
+
         ui_label_set_rect(demo.label, &rect);
         ui_label_set_halign(demo.label, gfx_halign_center);
@@ -473 +491 @@
         ui_pbutton_set_cb(demo.pb1, &pbutton_cb, (void *) &demo);
 
-        rect.p0.x = 15;
-        rect.p0.y = 111;
-        rect.p1.x = 105;
-        rect.p1.y = 139;
+        /* FIXME: Auto layout */
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 20;
+                rect.p0.y = 8;
+                rect.p1.x = 30;
+                rect.p1.y = 9;
+        } else {
+                rect.p0.x = 15;
+                rect.p0.y = 111;
+                rect.p1.x = 105;
+                rect.p1.y = 139;
+        }
+
         ui_pbutton_set_rect(demo.pb1, &rect);
 
@@ -495 +522 @@
         ui_pbutton_set_cb(demo.pb2, &pbutton_cb, (void *) &demo);
 
-        rect.p0.x = 115;
-        rect.p0.y = 111;
-        rect.p1.x = 205;
-        rect.p1.y = 139;
+        if (ui_is_textmode(ui)) {
+                rect.p0.x = 50;
+                rect.p0.y = 8;
+                rect.p1.x = 60;
+                rect.p1.y = 9;
+        } else {
+                rect.p0.x = 115;
+                rect.p0.y = 111;
+                rect.p1.x = 205;
+                rect.p1.y = 139;
+        }
+
         ui_pbutton_set_rect(demo.pb2, &rect);