Changeset d68239a1 in mainline for uspace/lib/ui/include

Timestamp:

2022-04-04T14:48:41Z (3 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.

Location:

uspace/lib/ui/include

Files:

• types/ui/pbutton.h (modified) (2 diffs)
• ui/paint.h (modified) (1 diff)
• ui/pbutton.h (modified) (2 diffs)

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

@@ -37 +37 @@
 #define _UI_TYPES_PBUTTON_H
 
+#include <errno.h>
+#include <gfx/coord.h>
+
 struct ui_pbutton;
 typedef struct ui_pbutton ui_pbutton_t;
@@ -47 +50 @@
 } 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;
+
 #endif
 

uspace/lib/ui/include/ui/paint.h

@@ -55 +55 @@
 extern errno_t ui_paint_filled_circle(gfx_context_t *, gfx_coord2_t *,
     gfx_coord_t, ui_fcircle_part_t);
+extern errno_t ui_paint_up_triangle(gfx_context_t *, gfx_coord2_t *,
+    gfx_coord_t);
+extern errno_t ui_paint_down_triangle(gfx_context_t *, gfx_coord2_t *,
+    gfx_coord_t);
+extern errno_t ui_paint_left_triangle(gfx_context_t *, gfx_coord2_t *,
+    gfx_coord_t);
+extern errno_t ui_paint_right_triangle(gfx_context_t *, gfx_coord2_t *,
+    gfx_coord_t);
 extern errno_t ui_paint_text_box(ui_resource_t *, gfx_rect_t *,
     ui_box_style_t, gfx_color_t *);

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

@@ -1 +1 @@
 /*
- * Copyright (c) 2020 Jiri Svoboda
+ * Copyright (c) 2022 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 *,
+    void *);
 extern void ui_pbutton_set_rect(ui_pbutton_t *, gfx_rect_t *);
 extern void ui_pbutton_set_default(ui_pbutton_t *, bool);