Changeset b769ca0 in mainline for uspace/lib/ui/src/pbutton.c

Timestamp:

2026-02-19T00:01:36Z (45 hours ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Children:

08fcaf2

Parents:

39f67f1

Message:

Allow overriding the complete UI push button paint routine.

File:

• uspace/lib/ui/src/pbutton.c (modified) (4 diffs)

uspace/lib/ui/src/pbutton.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -142 +142 @@
 }
 
-/** Set push button decoration ops.
- *
- * @param pbutton Push button
- * @param ops Push button decoration callbacks
+/** Set push button ops.
+ *
+ * These allow overriding the function for painting the button or
+ * painting the button decoration.
+ *
+ * @param pbutton Push button
+ * @param ops Push button ops
  * @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;
+void ui_pbutton_set_ops(ui_pbutton_t *pbutton, ui_pbutton_ops_t *ops, void *arg)
+{
+        pbutton->ops = ops;
+        pbutton->ops_arg = arg;
 }
 
@@ -379 +381 @@
         }
 
-        if (pbutton->decor_ops != NULL && pbutton->decor_ops->paint != NULL) {
+        if (pbutton->ops != NULL && pbutton->ops->decor_paint != NULL) {
                 /* Custom decoration */
-                rc = pbutton->decor_ops->paint(pbutton, pbutton->decor_arg,
+                rc = pbutton->ops->decor_paint(pbutton, pbutton->ops_arg,
                     &pos);
                 if (rc != EOK)
@@ -503 +505 @@
 errno_t ui_pbutton_paint(ui_pbutton_t *pbutton)
 {
-        if (pbutton->res->textmode)
+        if (pbutton->ops != NULL && pbutton->ops->paint != NULL) {
+                /* Custom paint routine */
+                return pbutton->ops->paint(pbutton, pbutton->ops_arg);
+        } else if (pbutton->res->textmode) {
                 return ui_pbutton_paint_text(pbutton);
-        else
+        } else {
                 return ui_pbutton_paint_gfx(pbutton);
+        }
 }