Changes in uspace/lib/ui/src/label.c [4583015:b41564c] in mainline

File:

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

uspace/lib/ui/src/label.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2020 Jiri Svoboda
  * All rights reserved.
  *
@@ -134 +134 @@
 {
         label->halign = halign;
-}
-
-/** 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;
 }
 
@@ -200 +190 @@
         }
 
-        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;
-        }
+        pos.y = label->rect.p0.y;
 
         gfx_text_fmt_init(&fmt);
-        fmt.font = label->res->font;
-        fmt.color = label->res->wnd_text_color;
         fmt.halign = label->halign;
-        fmt.valign = label->valign;
-
-        rc = gfx_puttext(&pos, &fmt, label->text);
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_update(label->res->gc);
+        fmt.valign = gfx_valign_top;
+
+        rc = gfx_set_color(label->res->gc, label->res->wnd_text_color);
+        if (rc != EOK)
+                goto error;
+
+        rc = gfx_puttext(label->res->font, &pos, &fmt, label->text);
         if (rc != EOK)
                 goto error;