Changeset d68239a1 in mainline for uspace/lib/ui/src/scrollbar.c

Timestamp:

2022-04-04T14:48:41Z (2 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

86fff971

Parents:

0d1d0ea

git-author:

Jiri Svoboda <jiri@…> (2022-04-03 17:48:17)

git-committer:

Jiri Svoboda <jiri@…> (2022-04-04 14:48:41)

Message:

Scrollbar needs custom button decorations

Push button now allows setting a 'custom decoration' which means
instead of painting the button text a callback function is invoked
to paint the decoration.

File:

• uspace/lib/ui/src/scrollbar.c (modified) (7 diffs)

uspace/lib/ui/src/scrollbar.c

@@ -78 +78 @@
 enum {
         /** Scrollbar button width */
-        ui_scrollbar_btn_len = 20,
+        ui_scrollbar_btn_len = 21,
         /** Scrollbar button width in text mode */
         ui_scrollbar_btn_len_text = 1,
@@ -86 +86 @@
         ui_scrollbar_thumb_bevel_width = 2,
         /** Scrollbar default thumb length */
-        ui_scrollbar_def_thumb_len = 20,
+        ui_scrollbar_def_thumb_len = 21,
         /** Scrollbar default thumb length in text mode */
         ui_scrollbar_def_thumb_len_text = 1,
@@ -97 +97 @@
 static void ui_scrollbar_up_btn_down(ui_pbutton_t *, void *);
 static void ui_scrollbar_up_btn_up(ui_pbutton_t *, void *);
+static errno_t ui_scrollbar_up_btn_decor_paint(ui_pbutton_t *, void *,
+    gfx_coord2_t *);
+static errno_t ui_scrollbar_down_btn_decor_paint(ui_pbutton_t *, void *,
+    gfx_coord2_t *);
 static void ui_scrollbar_down_btn_down(ui_pbutton_t *, void *);
 static void ui_scrollbar_down_btn_up(ui_pbutton_t *, void *);
@@ -108 +112 @@
 };
 
+static ui_pbutton_decor_ops_t ui_scrollbar_up_btn_decor_ops = {
+        .paint = ui_scrollbar_up_btn_decor_paint
+};
+
 static ui_pbutton_cb_t ui_scrollbar_down_btn_cb = {
         .down = ui_scrollbar_down_btn_down,
         .up = ui_scrollbar_down_btn_up
+};
+
+static ui_pbutton_decor_ops_t ui_scrollbar_down_btn_decor_ops = {
+        .paint = ui_scrollbar_down_btn_decor_paint
 };
 
@@ -188 +200 @@
 
         ui_pbutton_set_cb(scrollbar->up_btn, &ui_scrollbar_up_btn_cb,
-            (void *) scrollbar);
+            scrollbar);
+
+        ui_pbutton_set_decor_ops(scrollbar->up_btn,
+            &ui_scrollbar_up_btn_decor_ops, (void *) scrollbar);
 
         rc = ui_pbutton_create(resource, down_text, &scrollbar->down_btn);
@@ -196 +211 @@
         ui_pbutton_set_cb(scrollbar->down_btn, &ui_scrollbar_down_btn_cb,
             (void *) scrollbar);
+
+        ui_pbutton_set_decor_ops(scrollbar->down_btn,
+            &ui_scrollbar_down_btn_decor_ops, (void *) scrollbar);
 
         scrollbar->thumb_len = resource->textmode ?
@@ -961 +979 @@
 }
 
+/** Paint up button decoration.
+ *
+ * @param pbutton Push button
+ * @param arg Argument (ui_scrollbar_t *)
+ * @param pos Center position
+ */
+static errno_t ui_scrollbar_up_btn_decor_paint(ui_pbutton_t *pbutton,
+    void *arg, gfx_coord2_t *pos)
+{
+        ui_scrollbar_t *scrollbar = (ui_scrollbar_t *)arg;
+        errno_t rc;
+
+        rc = gfx_set_color(pbutton->res->gc, pbutton->res->btn_text_color);
+        if (rc != EOK)
+                return rc;
+
+        if (scrollbar->dir == ui_sbd_horiz)
+                return ui_paint_left_triangle(pbutton->res->gc, pos, 5);
+        else
+                return ui_paint_up_triangle(pbutton->res->gc, pos, 5);
+}
+
+/** Paint down button decoration.
+ *
+ * @param pbutton Push button
+ * @param arg Argument (ui_scrollbar_t *)
+ * @param pos Center position
+ */
+static errno_t ui_scrollbar_down_btn_decor_paint(ui_pbutton_t *pbutton,
+    void *arg, gfx_coord2_t *pos)
+{
+        ui_scrollbar_t *scrollbar = (ui_scrollbar_t *)arg;
+        errno_t rc;
+
+        rc = gfx_set_color(pbutton->res->gc, pbutton->res->btn_text_color);
+        if (rc != EOK)
+                return rc;
+
+        if (scrollbar->dir == ui_sbd_horiz)
+                return ui_paint_right_triangle(pbutton->res->gc, pos, 5);
+        else
+                return ui_paint_down_triangle(pbutton->res->gc, pos, 5);
+}
+
 /** Scrollbar down button pressed.
  *