Changeset 81ec7e1 in mainline for uspace/lib/ui/src/menuentry.c

Timestamp:

2021-08-31T08:57:24Z (4 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

b79c91cc

Parents:

ff6e91b

git-author:

Jiri Svoboda <jiri@…> (2021-08-30 20:57:08)

git-committer:

Jiri Svoboda <jiri@…> (2021-08-31 08:57:24)

Message:

Brace for a text mode menu separator entry

Pun intended.

File:

• uspace/lib/ui/src/menuentry.c (modified) (1 diff)

uspace/lib/ui/src/menuentry.c

@@ -349 +349 @@
 
         if (mentry->separator) {
-                rect.p0 = geom.caption_pos;
-                rect.p1.x = geom.shortcut_pos.x;
-                rect.p1.y = rect.p0.y + 2;
-                rc = ui_paint_bevel(res->gc, &rect, res->wnd_shadow_color,
-                    res->wnd_highlight_color, 1, NULL);
-                if (rc != EOK)
-                        goto error;
+                if (res->textmode) {
+                        rect = geom.outer_rect;
+                        rect.p0.x -= 1;
+                        rect.p1.x += 1;
+
+                        rc = ui_paint_text_hbrace(res, &rect, ui_box_single,
+                            res->wnd_face_color);
+                        if (rc != EOK)
+                                goto error;
+                } else {
+                        rect.p0 = geom.caption_pos;
+                        rect.p1.x = geom.shortcut_pos.x;
+                        rect.p1.y = rect.p0.y + 2;
+                        rc = ui_paint_bevel(res->gc, &rect, res->wnd_shadow_color,
+                            res->wnd_highlight_color, 1, NULL);
+                        if (rc != EOK)
+                                goto error;
+                }
         }