Changeset f1f433d in mainline for uspace/lib/ui

Timestamp:

2022-11-04T20:54:04Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

3a6d44b7

Parents:

fc00f0d

Message:

Update window button when window caption changes

Location:

uspace/lib/ui

Files:

• include/ui/pbutton.h (modified) (1 diff)
• private/pbutton.h (modified) (1 diff)
• src/pbutton.c (modified) (2 diffs)
• test/pbutton.c (modified) (1 diff)

uspace/lib/ui/include/ui/pbutton.h

@@ -56 +56 @@
 extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);
 extern void ui_pbutton_set_default(ui_pbutton_t *, bool);
+extern errno_t ui_pbutton_set_caption(ui_pbutton_t *, const char *);
 extern errno_t ui_pbutton_paint(ui_pbutton_t *);
 extern void ui_pbutton_press(ui_pbutton_t *);

uspace/lib/ui/private/pbutton.h

@@ -62 +62 @@
         gfx_rect_t rect;
         /** Caption */
-        const char *caption;
+        char *caption;
         /** Button is selected as default */
         bool isdefault;

uspace/lib/ui/src/pbutton.c

@@ -114 +114 @@
 
         ui_control_delete(pbutton->control);
+        free(pbutton->caption);
         free(pbutton);
 }
@@ -183 +184 @@
 {
         pbutton->isdefault = isdefault;
+}
+
+/** Set push button caption.
+ *
+ * @param pbutton Button
+ * @param caption New caption
+ * @return EOK on success, ENOMEM if out of memory
+ */
+errno_t ui_pbutton_set_caption(ui_pbutton_t *pbutton, const char *caption)
+{
+        char *dcaption;
+
+        dcaption = str_dup(caption);
+        if (dcaption == NULL)
+                return ENOMEM;
+
+        free(pbutton->caption);
+        pbutton->caption = dcaption;
+        return EOK;
 }
 

uspace/lib/ui/test/pbutton.c

@@ -190 +190 @@
 }
 
+/** Set caption sets internal field */
+PCUT_TEST(set_caption)
+{
+        ui_pbutton_t *pbutton;
+        errno_t rc;
+
+        rc = ui_pbutton_create(NULL, "Hello", &pbutton);
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("Hello", pbutton->caption);
+
+        rc = ui_pbutton_set_caption(pbutton, "World");
+        PCUT_ASSERT_ERRNO_VAL(EOK, rc);
+
+        PCUT_ASSERT_STR_EQUALS("World", pbutton->caption);
+
+        ui_pbutton_destroy(pbutton);
+}
+
 /** Paint button */
 PCUT_TEST(paint)