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

Timestamp:

2022-03-07T21:07:02Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

master, ticket/834-toolchain-update, topic/msim-upgrade, topic/simplify-dev-export

Children:

96c6a00

Parents:

4583015

Message:

Rendering UI text with highlighted accelerators

Location:

uspace/lib/ui/include

Files:

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

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

@@ -36 +36 @@
 #ifndef _UI_TYPES_PAINT_H
 #define _UI_TYPES_PAINT_H
+
+#include <gfx/color.h>
+#include <gfx/font.h>
 
 /** Filled circle parts */
@@ -81 +84 @@
 } ui_box_style_t;
 
+/** UI text formatting */
+typedef struct {
+        /** Text font */
+        gfx_font_t *font;
+        /** Standard color */
+        gfx_color_t *color;
+        /** Highlight color */
+        gfx_color_t *hgl_color;
+        /** Horizontal alignment */
+        gfx_halign_t halign;
+        /** Justification width (for gfx_halign_justify) */
+        gfx_coord_t justify_width;
+        /** Vertical alignment */
+        gfx_valign_t valign;
+} ui_text_fmt_t;
+
 #endif
 

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

@@ -59 +59 @@
 extern errno_t ui_paint_text_hbrace(ui_resource_t *, gfx_rect_t *,
     ui_box_style_t, gfx_color_t *);
+extern void ui_text_fmt_init(ui_text_fmt_t *);
+extern gfx_coord_t ui_text_width(gfx_font_t *, const char *);
+extern errno_t ui_paint_text(gfx_coord2_t *, ui_text_fmt_t *, const char *);
 
 #endif