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

Timestamp:

2021-10-24T08:28:43Z (2 years ago)

Author:

GitHub <noreply@…>

Children:

f628215

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:

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

uspace/lib/ui/src/wdecor.c

@@ -61 +61 @@
         wdecor_edge_h = 4,
         wdecor_tbar_h = 22,
-        wdecor_tbar_h_text = 1,
         wdecor_frame_w = 4,
         wdecor_frame_w_text = 1
@@ -170 +169 @@
         gfx_rect_t rect;
         gfx_rect_t trect;
+        gfx_rect_t text_rect;
         gfx_text_fmt_t fmt;
         gfx_coord2_t pos;
@@ -180 +180 @@
 
                 if (wdecor->res->textmode != false) {
-                        rc = ui_paint_bevel(wdecor->res->gc, &rect,
-                            wdecor->res->wnd_frame_hi_color,
-                            wdecor->res->wnd_frame_sh_color, 1, &rect);
+                        rc = ui_paint_text_box(wdecor->res, &rect,
+                            ui_box_double, wdecor->res->wnd_face_color);
                         if (rc != EOK)
                                 return rc;
@@ -208 +207 @@
                         if (rc != EOK)
                                 return rc;
+
+                        rc = gfx_set_color(wdecor->res->gc, wdecor->active ?
+                            wdecor->res->tbar_act_bg_color :
+                            wdecor->res->tbar_inact_bg_color);
+                        if (rc != EOK)
+                                return rc;
+
+                        rc = gfx_fill_rect(wdecor->res->gc, &trect);
+                        if (rc != EOK)
+                                return rc;
                 }
-
-                rc = gfx_set_color(wdecor->res->gc, wdecor->active ?
-                    wdecor->res->tbar_act_bg_color :
-                    wdecor->res->tbar_inact_bg_color);
-                if (rc != EOK)
-                        return rc;
-
-                rc = gfx_fill_rect(wdecor->res->gc, &trect);
-                if (rc != EOK)
-                        return rc;
 
                 gfx_text_fmt_init(&fmt);
@@ -230 +229 @@
                 pos.y = (trect.p0.y + trect.p1.y) / 2;
 
+                if (wdecor->res->textmode) {
+                        /* Make space around caption text */
+                        gfx_text_rect(wdecor->res->font, &pos, &fmt,
+                            wdecor->caption, &text_rect);
+
+                        /* Only make space if caption is non-empty */
+                        if (text_rect.p0.x < text_rect.p1.x) {
+                                text_rect.p0.x -= 1;
+                                text_rect.p1.x += 1;
+                        }
+
+                        rc = gfx_set_color(wdecor->res->gc, wdecor->active ?
+                            wdecor->res->tbar_act_bg_color :
+                            wdecor->res->tbar_inact_bg_color);
+                        if (rc != EOK)
+                                return rc;
+
+                        rc = gfx_fill_rect(wdecor->res->gc, &text_rect);
+                        if (rc != EOK)
+                                return rc;
+                }
+
                 rc = gfx_puttext(wdecor->res->font, &pos, &fmt, wdecor->caption);
                 if (rc != EOK)
@@ -301 +322 @@
 {
         gfx_coord_t frame_w;
-        gfx_coord_t tbar_h;
 
         /* Does window have a frame? */
@@ -318 +338 @@
         /* Does window have a title bar? */
         if ((wdecor->style & ui_wds_titlebar) != 0) {
-                tbar_h = wdecor->res->textmode ?
-                    wdecor_tbar_h_text : wdecor_tbar_h;
-
-                geom->title_bar_rect.p0 = geom->interior_rect.p0;
-                geom->title_bar_rect.p1.x = geom->interior_rect.p1.x;
-                geom->title_bar_rect.p1.y = geom->interior_rect.p0.y + tbar_h;
+                if (wdecor->res->textmode) {
+                        geom->title_bar_rect.p0 = wdecor->rect.p0;
+                        geom->title_bar_rect.p1.x = wdecor->rect.p1.x;
+                        geom->title_bar_rect.p1.y = wdecor->rect.p0.y + 1;
+                } else {
+                        geom->title_bar_rect.p0 = geom->interior_rect.p0;
+                        geom->title_bar_rect.p1.x = geom->interior_rect.p1.x;
+                        geom->title_bar_rect.p1.y = geom->interior_rect.p0.y +
+                            wdecor_tbar_h;
+                }
 
                 geom->app_area_rect.p0.x = geom->interior_rect.p0.x;