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

File:

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

uspace/lib/ui/src/slider.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2021 Jiri Svoboda
  * All rights reserved.
  *
@@ -38 +38 @@
 #include <gfx/context.h>
 #include <gfx/render.h>
-#include <gfx/text.h>
 #include <io/pos_event.h>
 #include <stdlib.h>
@@ -58 +57 @@
         /** Slider button height */
         ui_slider_btn_h = 23,
-        /** 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,
@@ -88 +83 @@
  *
  * @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, ui_slider_t **rslider)
+errno_t ui_slider_create(ui_resource_t *resource, const char *caption,
+    ui_slider_t **rslider)
 {
         ui_slider_t *slider;
@@ -242 +239 @@
         rect->p0.x = pos.x;
         rect->p0.y = pos.y;
-
-        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;
-        }
+        rect->p1.x = pos.x + ui_slider_btn_w;
+        rect->p1.y = pos.y + ui_slider_btn_h;
 }
 
@@ -260 +251 @@
 {
         gfx_coord2_t dims;
-        gfx_coord_t w;
 
         gfx_rect_dims(&slider->rect, &dims);
-        w = slider->res->textmode ? ui_slider_btn_w_text :
-            ui_slider_btn_w;
-        return dims.x - w;
-}
-
-/** Paint slider in graphics mode.
+        return dims.x - ui_slider_btn_w;
+}
+
+/** Paint slider.
  *
  * @param slider Slider
  * @return EOK on success or an error code
  */
-errno_t ui_slider_paint_gfx(ui_slider_t *slider)
+errno_t ui_slider_paint(ui_slider_t *slider)
 {
         gfx_coord2_t pos;
@@ -327 +315 @@
 }
 
-/** Paint slider in text mode.
- *
- * @param slider Slider
- * @return EOK on success or an error code
- */
-errno_t ui_slider_paint_text(ui_slider_t *slider)
-{
-        gfx_coord2_t pos;
-        gfx_text_fmt_t fmt;
-        gfx_coord_t w, i;
-        char *buf;
-        const char *gchar;
-        size_t gcharsz;
-        errno_t rc;
-
-        /* Paint slider groove */
-
-        pos = slider->rect.p0;
-
-        gfx_text_fmt_init(&fmt);
-        fmt.font = slider->res->font;
-        fmt.color = slider->res->wnd_text_color;
-        fmt.halign = gfx_halign_left;
-        fmt.valign = gfx_valign_top;
-
-        w = slider->rect.p1.x - slider->rect.p0.x;
-        gchar = "\u2550";
-        gcharsz = str_size(gchar);
-
-        buf = malloc(w * gcharsz + 1);
-        if (buf == NULL)
-                return ENOMEM;
-
-        for (i = 0; i < w; i++)
-                str_cpy(buf + i * gcharsz, (w - i) * gcharsz + 1, gchar);
-        buf[w * gcharsz] = '\0';
-
-        rc = gfx_puttext(&pos, &fmt, buf);
-        free(buf);
-        if (rc != EOK)
-                goto error;
-
-        /* Paint slider button */
-
-        pos.x += slider->pos;
-
-        rc = gfx_puttext(&pos, &fmt, "[O]");
-        if (rc != EOK)
-                goto error;
-
-        rc = gfx_update(slider->res->gc);
-        if (rc != EOK)
-                goto error;
-
-        return EOK;
-error:
-        return rc;
-}
-
-/** Paint slider.
- *
- * @param slider Slider
- * @return EOK on success or an error code
- */
-errno_t ui_slider_paint(ui_slider_t *slider)
-{
-        if (slider->res->textmode)
-                return ui_slider_paint_text(slider);
-        else
-                return ui_slider_paint_gfx(slider);
-}
-
 /** Clear slider button.
  *
@@ -408 +324 @@
         gfx_rect_t rect;
         errno_t rc;
-
-        /* No need to clear button in text mode */
-        if (slider->res->textmode)
-                return EOK;
 
         ui_slider_btn_rect(slider, &rect);
@@ -528 +440 @@
                 ui_slider_update(slider, &pos);
                 break;
-        case POS_DCLICK:
-                break;
         }