Changes in uspace/lib/ui/src/pbutton.c [b769ca0:3c54869] in mainline

File:

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

uspace/lib/ui/src/pbutton.c

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