Changeset 45004f3 in mainline for uspace/lib/ui/src/wdecor.c

Timestamp:

2021-09-01T09:45:37Z (3 years ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

1ebcb791

Parents:

b79c91cc

git-author:

Jiri Svoboda <jiri@…> (2021-08-31 19:44:34)

git-committer:

Jiri Svoboda <jiri@…> (2021-09-01 09:45:37)

Message:

Text-style window title bar

File:

• uspace/lib/ui/src/wdecor.c (modified) (6 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;
@@ -207 +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);
@@ -229 +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)
@@ -300 +322 @@
 {
         gfx_coord_t frame_w;
-        gfx_coord_t tbar_h;
 
         /* Does window have a frame? */
@@ -317 +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;