Changeset b769ca0 in mainline

Timestamp:

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

Author:

Jiri Svoboda <jiri@…>

Branches:

master

Parents:

39f67f1

Message:

Allow overriding the complete UI push button paint routine.

Location:

uspace/lib/ui

Files:

• include/types/ui/pbutton.h (modified) (2 diffs)
• include/ui/pbutton.h (modified) (2 diffs)
• private/pbutton.h (modified) (2 diffs)
• src/pbutton.c (modified) (4 diffs)
• src/scrollbar.c (modified) (5 diffs)
• src/wdecor.c (modified) (7 diffs)

uspace/lib/ui/include/types/ui/pbutton.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2022 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -56 +56 @@
 } ui_pbutton_cb_t;
 
-/** Push button decoration ops */
-typedef struct ui_pbutton_decor_ops {
-        errno_t (*paint)(ui_pbutton_t *, void *, gfx_coord2_t *);
-} ui_pbutton_decor_ops_t;
+/** Push button ops */
+typedef struct ui_pbutton_ops {
+        errno_t (*decor_paint)(ui_pbutton_t *, void *, gfx_coord2_t *);
+        errno_t (*paint)(ui_pbutton_t *, void *);
+} ui_pbutton_ops_t;
 
 #endif

uspace/lib/ui/include/ui/pbutton.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -51 +51 @@
 extern ui_control_t *ui_pbutton_ctl(ui_pbutton_t *);
 extern void ui_pbutton_set_cb(ui_pbutton_t *, ui_pbutton_cb_t *, void *);
-extern void ui_pbutton_set_decor_ops(ui_pbutton_t *, ui_pbutton_decor_ops_t *,
+extern void ui_pbutton_set_ops(ui_pbutton_t *, ui_pbutton_ops_t *,
     void *);
 extern void ui_pbutton_set_flags(ui_pbutton_t *, ui_pbutton_flags_t);

uspace/lib/ui/private/pbutton.h

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -55 +55 @@
         /** Callback argument */
         void *arg;
-        /** Custom decoration ops or @c NULL */
-        struct ui_pbutton_decor_ops *decor_ops;
-        /** Decoration argument */
-        void *decor_arg;
+        /** Custom ops or @c NULL */
+        struct ui_pbutton_ops *ops;
+        /** Ops argument */
+        void *ops_arg;
         /** Push button rectangle */
         gfx_rect_t rect;

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);
+        }
 }
 

uspace/lib/ui/src/scrollbar.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2023 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -112 +112 @@
 };
 
-static ui_pbutton_decor_ops_t ui_scrollbar_up_btn_decor_ops = {
-        .paint = ui_scrollbar_up_btn_decor_paint
+static ui_pbutton_ops_t ui_scrollbar_up_btn_ops = {
+        .decor_paint = ui_scrollbar_up_btn_decor_paint
 };
 
@@ -121 +121 @@
 };
 
-static ui_pbutton_decor_ops_t ui_scrollbar_down_btn_decor_ops = {
-        .paint = ui_scrollbar_down_btn_decor_paint
+static ui_pbutton_ops_t ui_scrollbar_down_btn_ops = {
+        .decor_paint = ui_scrollbar_down_btn_decor_paint
 };
 
@@ -202 +202 @@
             scrollbar);
 
-        ui_pbutton_set_decor_ops(scrollbar->up_btn,
-            &ui_scrollbar_up_btn_decor_ops, (void *) scrollbar);
+        ui_pbutton_set_ops(scrollbar->up_btn, &ui_scrollbar_up_btn_ops,
+            (void *)scrollbar);
 
         ui_pbutton_set_flags(scrollbar->up_btn, ui_pbf_no_text_depress);
@@ -212 +212 @@
 
         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);
+            (void *)scrollbar);
+
+        ui_pbutton_set_ops(scrollbar->down_btn, &ui_scrollbar_down_btn_ops,
+            (void *)scrollbar);
 
         ui_pbutton_set_flags(scrollbar->down_btn, ui_pbf_no_text_depress);

uspace/lib/ui/src/wdecor.c

@@ -1 +1 @@
 /*
- * Copyright (c) 2024 Jiri Svoboda
+ * Copyright (c) 2026 Jiri Svoboda
  * All rights reserved.
  *
@@ -66 +66 @@
 };
 
-static ui_pbutton_decor_ops_t ui_wdecor_btn_min_decor_ops = {
-        .paint = ui_wdecor_btn_min_paint
+static ui_pbutton_ops_t ui_wdecor_btn_min_ops = {
+        .decor_paint = ui_wdecor_btn_min_paint
 };
 
@@ -74 +74 @@
 };
 
-static ui_pbutton_decor_ops_t ui_wdecor_btn_max_decor_ops = {
-        .paint = ui_wdecor_btn_max_paint
+static ui_pbutton_ops_t ui_wdecor_btn_max_ops = {
+        .decor_paint = ui_wdecor_btn_max_paint
 };
 
@@ -82 +82 @@
 };
 
-static ui_pbutton_decor_ops_t ui_wdecor_btn_close_decor_ops = {
-        .paint = ui_wdecor_btn_close_paint
+static ui_pbutton_ops_t ui_wdecor_btn_close_ops = {
+        .decor_paint = ui_wdecor_btn_close_paint
 };
 
@@ -175 +175 @@
                     (void *)wdecor);
 
-                ui_pbutton_set_decor_ops(wdecor->btn_min,
-                    &ui_wdecor_btn_min_decor_ops, (void *)wdecor);
+                ui_pbutton_set_ops(wdecor->btn_min, &ui_wdecor_btn_min_ops,
+                    (void *)wdecor);
         }
 
@@ -189 +189 @@
                     (void *)wdecor);
 
-                ui_pbutton_set_decor_ops(wdecor->btn_max,
-                    &ui_wdecor_btn_max_decor_ops, (void *)wdecor);
+                ui_pbutton_set_ops(wdecor->btn_max, &ui_wdecor_btn_max_ops,
+                    (void *)wdecor);
         }
 
@@ -203 +203 @@
                     (void *)wdecor);
 
-                ui_pbutton_set_decor_ops(wdecor->btn_close,
-                    &ui_wdecor_btn_close_decor_ops, (void *)wdecor);
+                ui_pbutton_set_ops(wdecor->btn_close, &ui_wdecor_btn_close_ops,
+                    (void *)wdecor);
         }