Changeset a0aeb8f in mainline

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

Location:

uspace

Files:

• app/hello/hello.c (modified) (3 diffs)
• lib/gfxfont/src/text.c (modified) (2 diffs)
• lib/ui/include/ui/label.h (modified) (2 diffs)
• lib/ui/private/label.h (modified) (2 diffs)
• lib/ui/src/label.c (modified) (2 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));

uspace/lib/gfxfont/src/text.c

@@ -178 +178 @@
 {
         gfx_font_metrics_t fmetrics;
-        gfx_coord2_t cpos;
         gfx_coord_t width;
 
@@ -210 +209 @@
                         break;
                 case gfx_valign_bottom:
-                        cpos.y -= fmetrics.descent + 1;
+                        spos->y -= fmetrics.descent + 1;
                         break;
                 default:

uspace/lib/ui/include/ui/label.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -50 +50 @@
 extern void ui_label_set_rect(ui_label_t *, gfx_rect_t *);
 extern void ui_label_set_halign(ui_label_t *, gfx_halign_t);
+extern void ui_label_set_valign(ui_label_t *, gfx_valign_t);
 extern errno_t ui_label_set_text(ui_label_t *, const char *);
 extern errno_t ui_label_paint(ui_label_t *);

uspace/lib/ui/private/label.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -54 +54 @@
         /** Horizontal alignment */
         gfx_halign_t halign;
+        /** Vertical alignment */
+        gfx_valign_t valign;
         /** Text */
         char *text;

uspace/lib/ui/src/label.c

@@ -136 +136 @@
 }
 
+/** Set label vertical text alignment.
+ *
+ * @param label Label
+ * @param valign Vertical alignment
+ */
+void ui_label_set_valign(ui_label_t *label, gfx_valign_t valign)
+{
+        label->valign = valign;
+}
+
 /** Set label text.
  *
@@ -190 +200 @@
         }
 
-        pos.y = label->rect.p0.y;
+        switch (label->valign) {
+        case gfx_valign_top:
+                pos.y = label->rect.p0.y;
+                break;
+        case gfx_valign_center:
+                pos.y = (label->rect.p0.y + label->rect.p1.y) / 2;
+                break;
+        case gfx_valign_bottom:
+                pos.y = label->rect.p1.y;
+                break;
+        case gfx_valign_baseline:
+                return EINVAL;
+        }
 
         gfx_text_fmt_init(&fmt);