Changeset 8a9a41e in mainline for uspace/lib/ui/src/menuentry.c


Ignore:
Timestamp:
2021-10-24T08:28:43Z (4 years ago)
Author:
GitHub <noreply@…>
Children:
1b9fcd0
Parents:
2ce943a (diff), cd981f2a (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
git-author:
Erik Kučák <35500848+Riko196@…> (2021-10-24 08:28:43)
git-committer:
GitHub <noreply@…> (2021-10-24 08:28:43)
Message:

Merge branch 'HelenOS:master' into master

File:
1 edited

Legend:

Unmodified
Added
Removed
  • uspace/lib/ui/src/menuentry.c

    r2ce943a r8a9a41e  
    349349
    350350        if (mentry->separator) {
    351                 rect.p0 = geom.caption_pos;
    352                 rect.p1.x = geom.shortcut_pos.x;
    353                 rect.p1.y = rect.p0.y + 2;
    354                 rc = ui_paint_bevel(res->gc, &rect, res->wnd_shadow_color,
    355                     res->wnd_highlight_color, 1, NULL);
    356                 if (rc != EOK)
    357                         goto error;
     351                if (res->textmode) {
     352                        rect = geom.outer_rect;
     353                        rect.p0.x -= 1;
     354                        rect.p1.x += 1;
     355
     356                        rc = ui_paint_text_hbrace(res, &rect, ui_box_single,
     357                            res->wnd_face_color);
     358                        if (rc != EOK)
     359                                goto error;
     360                } else {
     361                        rect.p0 = geom.caption_pos;
     362                        rect.p1.x = geom.shortcut_pos.x;
     363                        rect.p1.y = rect.p0.y + 2;
     364                        rc = ui_paint_bevel(res->gc, &rect, res->wnd_shadow_color,
     365                            res->wnd_highlight_color, 1, NULL);
     366                        if (rc != EOK)
     367                                goto error;
     368                }
    358369        }
    359370
Note: See TracChangeset for help on using the changeset viewer.