Changeset ef734b7 in mainline

Timestamp:

2021-02-05T15:59:16Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

2ab8ab3

Parents:

5a68791

Message:

Slider UI control

Location:

uspace

Files:

• app/uidemo/uidemo.c (modified) (5 diffs)
• app/uidemo/uidemo.h (modified) (2 diffs)
• lib/ui/include/types/ui/slider.h (added)
• lib/ui/include/ui/slider.h (added)
• lib/ui/meson.build (modified) (2 diffs)
• lib/ui/private/slider.h (added)
• lib/ui/src/slider.c (added)
• lib/ui/test/main.c (modified) (1 diff)
• lib/ui/test/slider.c (added)

uspace/app/uidemo/uidemo.c

@@ -37 +37 @@
 #include <io/pixelmap.h>
 #include <stdio.h>
+#include <stdlib.h>
 #include <str.h>
 #include <ui/entry.h>
@@ -74 +75 @@
 };
 
+static void slider_moved(ui_slider_t *, void *, gfx_coord_t);
+
+static ui_slider_cb_t slider_cb = {
+        .moved = slider_moved
+};
+
 /** Window close button was clicked.
  *
@@ -150 +157 @@
 }
 
+/** Slider was moved.
+ *
+ * @param slider Slider
+ * @param arg Argument (demo)
+ * @param pos Position
+ */
+static void slider_moved(ui_slider_t *slider, void *arg, gfx_coord_t pos)
+{
+        ui_demo_t *demo = (ui_demo_t *) arg;
+        char *str;
+        errno_t rc;
+        int rv;
+
+        rv = asprintf(&str, "Slider at %d of %d", (int) pos,
+            ui_slider_length(slider));
+        if (rv < 0) {
+                printf("Out of memory.\n");
+                return;
+        }
+
+        rc = ui_entry_set_text(demo->entry, str);
+        if (rc != EOK)
+                printf("Error changing entry text.\n");
+        (void) ui_entry_paint(demo->entry);
+
+        free(str);
+}
+
 /** Run UI demo on display server. */
 static errno_t ui_demo(const char *display_spec)
@@ -177 +212 @@
         params.rect.p0.y = 0;
         params.rect.p1.x = 220;
-        params.rect.p1.y = 330;
+        params.rect.p1.y = 340;
 
         memset((void *) &demo, 0, sizeof(demo));
@@ -397 +432 @@
 
         rc = ui_fixed_add(demo.fixed, ui_rbutton_ctl(demo.rb3));
+        if (rc != EOK) {
+                printf("Error adding control to layout.\n");
+                return rc;
+        }
+
+        rc = ui_slider_create(ui_res, "Slide!", &demo.slider);
+        if (rc != EOK) {
+                printf("Error creating button.\n");
+                return rc;
+        }
+
+        ui_slider_set_cb(demo.slider, &slider_cb, (void *) &demo);
+
+        rect.p0.x = 15;
+        rect.p0.y = 300;
+        rect.p1.x = 130;
+        rect.p1.y = 320;
+        ui_slider_set_rect(demo.slider, &rect);
+
+        rc = ui_fixed_add(demo.fixed, ui_slider_ctl(demo.slider));
         if (rc != EOK) {
                 printf("Error adding control to layout.\n");

uspace/app/uidemo/uidemo.h

@@ -44 +44 @@
 #include <ui/pbutton.h>
 #include <ui/rbutton.h>
+#include <ui/slider.h>
 #include <ui/ui.h>
 #include <ui/window.h>
@@ -62 +63 @@
         ui_rbutton_t *rb2;
         ui_rbutton_t *rb3;
+        ui_slider_t *slider;
 } ui_demo_t;
 

uspace/lib/ui/meson.build

@@ -40 +40 @@
         'src/rbutton.c',
         'src/resource.c',
+        'src/slider.c',
         'src/ui.c',
         'src/wdecor.c',
@@ -57 +58 @@
         'test/rbutton.c',
         'test/resource.c',
+        'test/slider.c',
         'test/ui.c',
         'test/wdecor.c',

uspace/lib/ui/test/main.c

@@ -41 +41 @@
 PCUT_IMPORT(rbutton);
 PCUT_IMPORT(resource);
+PCUT_IMPORT(slider);
 PCUT_IMPORT(ui);
 PCUT_IMPORT(wdecor);