Changeset ca2680d in mainline for uspace/lib/ui/src/menubar.c

Timestamp:

2022-03-07T21:07:02Z (3 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

File:

• uspace/lib/ui/src/menubar.c (modified) (7 diffs)

uspace/lib/ui/src/menubar.c

@@ -150 +150 @@
 {
         ui_resource_t *res;
-        gfx_text_fmt_t fmt;
+        ui_text_fmt_t fmt;
         gfx_coord2_t pos;
         gfx_coord2_t tpos;
@@ -184 +184 @@
         pos = mbar->rect.p0;
 
-        gfx_text_fmt_init(&fmt);
+        ui_text_fmt_init(&fmt);
         fmt.font = res->font;
         fmt.halign = gfx_halign_left;
@@ -192 +192 @@
         while (menu != NULL) {
                 caption = ui_menu_caption(menu);
-                width = gfx_text_width(res->font, caption) + 2 * hpad;
+                width = ui_text_width(res->font, caption) + 2 * hpad;
                 tpos.x = pos.x + hpad;
                 tpos.y = pos.y + vpad;
@@ -202 +202 @@
                 if (menu == mbar->selected) {
                         fmt.color = res->wnd_sel_text_color;
+                        fmt.hgl_color = res->wnd_sel_text_hgl_color;
                         bg_color = res->wnd_sel_text_bg_color;
                 } else {
                         fmt.color = res->wnd_text_color;
+                        fmt.hgl_color = res->wnd_text_hgl_color;
                         bg_color = res->wnd_face_color;
                 }
@@ -216 +218 @@
                         goto error;
 
-                rc = gfx_puttext(&tpos, &fmt, caption);
+                rc = ui_paint_text(&tpos, &fmt, caption);
                 if (rc != EOK)
                         goto error;
@@ -416 +418 @@
         while (menu != NULL) {
                 caption = ui_menu_caption(menu);
-                width = gfx_text_width(res->font, caption) + 2 * hpad;
+                width = ui_text_width(res->font, caption) + 2 * hpad;
 
                 rect.p0 = pos;
@@ -467 +469 @@
         while (cur != NULL) {
                 caption = ui_menu_caption(cur);
-                width = gfx_text_width(res->font, caption) + 2 * hpad;
+                width = ui_text_width(res->font, caption) + 2 * hpad;
 
                 rect.p0 = pos;