Changeset d68239a1 in mainline for uspace/lib/ui/src/pbutton.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/pbutton.c (modified) (4 diffs)

uspace/lib/ui/src/pbutton.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2021 Jiri Svoboda
+ * Copyright (c) 2022 Jiri Svoboda
  * All rights reserved.
  *
@@ -32 +32 @@
 /**
  * @file Push button
+ *
+ * Push button either uses text as decoration, or it can use a caller-provided
+ * function to paint the decoration.
  */
 
@@ -136 +139 @@
 }
 
+/** Set push button decoration ops.
+ *
+ * @param pbutton Push button
+ * @param ops Push button decoration callbacks
+ * @param arg Decoration ops argument
+ */
+void ui_pbutton_set_decor_ops(ui_pbutton_t *pbutton,
+    ui_pbutton_decor_ops_t *ops, void *arg)
+{
+        pbutton->decor_ops = ops;
+        pbutton->decor_arg = arg;
+}
+
 /** Set button rectangle.
  *
@@ -306 +322 @@
         }
 
-        gfx_text_fmt_init(&fmt);
-        fmt.font = pbutton->res->font;
-        fmt.color = pbutton->res->btn_text_color;
-        fmt.halign = gfx_halign_center;
-        fmt.valign = gfx_valign_center;
-
-        rc = gfx_puttext(&pos, &fmt, pbutton->caption);
-        if (rc != EOK)
-                goto error;
+        if (pbutton->decor_ops != NULL && pbutton->decor_ops->paint != NULL) {
+                /* Custom decoration */
+                rc = pbutton->decor_ops->paint(pbutton, pbutton->decor_arg,
+                    &pos);
+                if (rc != EOK)
+                        goto error;
+        } else {
+                /* Text decoration */
+                gfx_text_fmt_init(&fmt);
+                fmt.font = pbutton->res->font;
+                fmt.color = pbutton->res->btn_text_color;
+                fmt.halign = gfx_halign_center;
+                fmt.valign = gfx_valign_center;
+
+                rc = gfx_puttext(&pos, &fmt, pbutton->caption);
+                if (rc != EOK)
+                        goto error;
+        }
 
         rc = ui_pbutton_paint_frame(pbutton);