Changeset a0aeb8f in mainline for uspace/app/hello/hello.c

Timestamp:

2021-09-05T08:11:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

8ce56a6

Parents:

ab3bfc1

git-author:

Jiri Svoboda <jiri@…> (2021-09-05 08:09:56)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-05 08:11:37)

Message:

Fix broken T-shirt slogan

Need to make sure "# hello -d cons@" works well

File:

• uspace/app/hello/hello.c (modified) (3 diffs)

uspace/app/hello/hello.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -80 +80 @@
         ui_wnd_params_init(&params);
         params.caption = "Hello World";
-        params.rect.p0.x = 0;
-        params.rect.p0.y = 0;
-        params.rect.p1.x = 200;
-        params.rect.p1.y = 60;
+        if (ui_is_textmode(ui)) {
+                params.rect.p0.x = 0;
+                params.rect.p0.y = 0;
+                params.rect.p1.x = 24;
+                params.rect.p1.y = 5;
+        } else {
+                params.rect.p0.x = 0;
+                params.rect.p0.y = 0;
+                params.rect.p1.x = 200;
+                params.rect.p1.y = 60;
+        }
 
         memset((void *) &hello, 0, sizeof(hello));
@@ -111 +118 @@
         }
 
-        rect.p0.x = 10;
-        rect.p0.y = 35;
-        rect.p1.x = 190;
-        rect.p1.y = 50;
+        ui_window_get_app_rect(window, &rect);
         ui_label_set_rect(hello.label, &rect);
         ui_label_set_halign(hello.label, gfx_halign_center);
+        ui_label_set_valign(hello.label, gfx_valign_center);
 
         rc = ui_fixed_add(hello.fixed, ui_label_ctl(hello.label));