Changeset 58a67050 in mainline

Timestamp:

2020-10-21T22:26:33Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

08a79303

Parents:

a2f173b

Message:

Support different label text alignment

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (1 diff)
• lib/ui/include/ui/label.h (modified) (2 diffs)
• lib/ui/private/label.h (modified) (2 diffs)
• lib/ui/src/label.c (modified) (3 diffs)
• lib/ui/test/label.c (modified) (1 diff)

uspace/app/uidemo/uidemo.c

@@ -259 +259 @@
         rect.p1.y = 50;
         ui_label_set_rect(demo.label, &rect);
+        ui_label_set_halign(demo.label, gfx_halign_center);
 
         rc = ui_pbutton_create(ui_res, "Confirm", &demo.pb1);

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

@@ -39 +39 @@
 #include <errno.h>
 #include <gfx/coord.h>
+#include <gfx/text.h>
 #include <types/ui/label.h>
 #include <types/ui/resource.h>
@@ -46 +47 @@
 extern void ui_label_destroy(ui_label_t *);
 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 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

@@ -39 +39 @@
 
 #include <gfx/coord.h>
+#include <gfx/text.h>
 
 /** Actual structure of label.
@@ -49 +50 @@
         /** Label rectangle */
         gfx_rect_t rect;
+        /** Horizontal alignment */
+        gfx_halign_t halign;
         /** Text */
         char *text;

uspace/lib/ui/src/label.c

@@ -68 +68 @@
 
         label->res = resource;
+        label->halign = gfx_halign_left;
         *rlabel = label;
         return EOK;
@@ -92 +93 @@
 {
         label->rect = *rect;
+}
+
+/** Set label horizontal text alignment.
+ *
+ * @param label Label
+ * @param halign Horizontal alignment
+ */
+void ui_label_set_halign(ui_label_t *label, gfx_halign_t halign)
+{
+        label->halign = halign;
 }
 
@@ -135 +146 @@
                 goto error;
 
-        pos = label->rect.p0;
+        switch (label->halign) {
+        case gfx_halign_left:
+        case gfx_halign_justify:
+                pos.x = label->rect.p0.x;
+                break;
+        case gfx_halign_center:
+                pos.x = (label->rect.p0.x + label->rect.p1.x) / 2;
+                break;
+        case gfx_halign_right:
+                pos.y = label->rect.p1.x;
+                break;
+        }
+
+        pos.y = label->rect.p0.y;
 
         gfx_text_fmt_init(&fmt);
-        fmt.halign = gfx_halign_left;
+        fmt.halign = label->halign;
         fmt.valign = gfx_valign_top;
 

uspace/lib/ui/test/label.c

@@ -121 +121 @@
 }
 
+/** Set button text horizontal alignment sets internal field */
+PCUT_TEST(set_halign)
+{
+        ui_label_t *label;
+        errno_t rc;
+
+        rc = ui_label_create(NULL, "Hello", &label);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        ui_label_set_halign(label, gfx_halign_left);
+        PCUT_ASSERT_EQUALS(gfx_halign_left, label->halign);
+        ui_label_set_halign(label, gfx_halign_center);
+        PCUT_ASSERT_EQUALS(gfx_halign_center, label->halign);
+
+        ui_label_destroy(label);
+}
+
 /** Set button rectangle sets internal field */
 PCUT_TEST(set_text)