Changeset 0eca788 in mainline

Timestamp:

2022-03-15T19:22:58Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

f2b9ecf

Parents:

bd16113

Message:

Slider does not have a caption

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (1 diff)
• lib/ui/include/ui/slider.h (modified) (1 diff)
• lib/ui/src/slider.c (modified) (1 diff)
• lib/ui/test/slider.c (modified) (10 diffs)

uspace/app/uidemo/uidemo.c

@@ -1037 +1037 @@
         }
 
-        rc = ui_slider_create(ui_res, "Slide!", &demo.slider);
+        rc = ui_slider_create(ui_res, &demo.slider);
         if (rc != EOK) {
                 printf("Error creating button.\n");

uspace/lib/ui/include/ui/slider.h

@@ -46 +46 @@
 #include <types/ui/slider.h>
 
-extern errno_t ui_slider_create(ui_resource_t *, const char *,
-    ui_slider_t **);
+extern errno_t ui_slider_create(ui_resource_t *, ui_slider_t **);
 extern void ui_slider_destroy(ui_slider_t *);
 extern ui_control_t *ui_slider_ctl(ui_slider_t *);

uspace/lib/ui/src/slider.c

@@ -88 +88 @@
  *
  * @param resource UI resource
- * @param caption Caption
  * @param rslider Place to store pointer to new slider
  * @return EOK on success, ENOMEM if out of memory
  */
-errno_t ui_slider_create(ui_resource_t *resource, const char *caption,
-    ui_slider_t **rslider)
+errno_t ui_slider_create(ui_resource_t *resource, ui_slider_t **rslider)
 {
         ui_slider_t *slider;

uspace/lib/ui/test/slider.c

@@ -99 +99 @@
         errno_t rc;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
         PCUT_ASSERT_NOT_NULL(slider);
@@ -119 +119 @@
         errno_t rc;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -135 +135 @@
         errno_t rc;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -169 +169 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -199 +199 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -219 +219 @@
         test_cb_resp_t resp;
 
-        rc = ui_slider_create(NULL, "Hello", &slider);
+        rc = ui_slider_create(NULL, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -260 +260 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -316 +316 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -380 +380 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);
 
@@ -441 +441 @@
         PCUT_ASSERT_NOT_NULL(resource);
 
-        rc = ui_slider_create(resource, "Hello", &slider);
+        rc = ui_slider_create(resource, &slider);
         PCUT_ASSERT_ERRNO_VAL(EOK, rc);