Changeset 8a9a41e in mainline for uspace/lib/ui/src/label.c

Timestamp:

2021-10-24T08:28:43Z (4 years ago)

Author:

GitHub <noreply@…>

Children:

08d81ae

Parents:

2ce943a (diff), cd981f2a (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.

git-author:

Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)

git-committer:

GitHub <noreply@…> (2021-10-24 08:28:43)

Message:

Merge branch 'HelenOS:master' into master

File:

• uspace/lib/ui/src/label.c (modified) (2 diffs)

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);