Changes in uspace/lib/ui/src/slider.c [ff6e91b:0eca788] in mainline

File:

• uspace/lib/ui/src/slider.c (modified) (8 diffs)

uspace/lib/ui/src/slider.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -60 +60 @@
         /** Slider button width in text mode */
         ui_slider_btn_w_text = 3,
+        /** Slider button height in text mode */
+        ui_slider_btn_h_text = 1,
         /** Slider button frame thickness */
         ui_slider_btn_frame_thickness = 1,
@@ -86 +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;
@@ -242 +242 @@
         rect->p0.x = pos.x;
         rect->p0.y = pos.y;
-        rect->p1.x = pos.x + ui_slider_btn_w;
-        rect->p1.y = pos.y + ui_slider_btn_h;
+
+        if (slider->res->textmode) {
+                rect->p1.x = pos.x + ui_slider_btn_w_text;
+                rect->p1.y = pos.y + ui_slider_btn_h_text;
+        } else {
+                rect->p1.x = pos.x + ui_slider_btn_w;
+                rect->p1.y = pos.y + ui_slider_btn_h;
+        }
 }
 
@@ -341 +347 @@
 
         gfx_text_fmt_init(&fmt);
+        fmt.font = slider->res->font;
         fmt.color = slider->res->wnd_text_color;
         fmt.halign = gfx_halign_left;
@@ -357 +364 @@
         buf[w * gcharsz] = '\0';
 
-        rc = gfx_puttext(slider->res->font, &pos, &fmt, buf);
+        rc = gfx_puttext(&pos, &fmt, buf);
         free(buf);
         if (rc != EOK)
@@ -366 +373 @@
         pos.x += slider->pos;
 
-        rc = gfx_puttext(slider->res->font, &pos, &fmt,
-            "[O]");
+        rc = gfx_puttext(&pos, &fmt, "[O]");
         if (rc != EOK)
                 goto error;
@@ -522 +528 @@
                 ui_slider_update(slider, &pos);
                 break;
+        case POS_DCLICK:
+                break;
         }