Changeset 214aefb in mainline for uspace/lib/ui/src/wdecor.c

Timestamp:

2021-04-09T22:41:22Z (3 years ago)

Author:

jxsvoboda <5887334+jxsvoboda@…>

Branches:

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

Children:

0262f16c

Parents:

b0858150

git-author:

Jiri Svoboda <jiri@…> (2021-03-27 22:52:09)

git-committer:

jxsvoboda <5887334+jxsvoboda@…> (2021-04-09 22:41:22)

Message:

UI menu (WIP)

File:

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

uspace/lib/ui/src/wdecor.c

@@ -178 +178 @@
 
         if ((wdecor->style & ui_wds_frame) != 0) {
-                rc = ui_paint_bevel(wdecor->res->gc, &rect,
-                    wdecor->res->wnd_frame_hi_color,
-                    wdecor->res->wnd_frame_sh_color, 1, &rect);
-                if (rc != EOK)
-                        return rc;
-
-                if (wdecor->res->textmode == false) {
+
+                if (wdecor->res->textmode != false) {
                         rc = ui_paint_bevel(wdecor->res->gc, &rect,
-                            wdecor->res->wnd_highlight_color,
-                            wdecor->res->wnd_shadow_color, 1, &rect);
+                            wdecor->res->wnd_frame_hi_color,
+                            wdecor->res->wnd_frame_sh_color, 1, &rect);
+                        if (rc != EOK)
+                                return rc;
+                } else {
+                        rc = ui_paint_outset_frame(wdecor->res, &rect,
+                            &rect);
                         if (rc != EOK)
                                 return rc;