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

Timestamp:

2022-11-17T19:56:07Z (22 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

901b302

Parents:

5d62130

Message:

Implement text abbreviation

When rendering text, gfx_puttext can now abbreviate it with …
to fit within the specified width. Use on window captions.
Now Barber Pole can have a proper caption.

Note that now the caption is centered on the space between the left
edge and the buttons, instead on the entire title bar, so it
may look a little lopsided. It will look better once we put
something to the left side of the title bar.

File:

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

uspace/lib/ui/src/wdecor.c

@@ -88 +88 @@
         /** Window frame width in text mode */
         wdecor_frame_w_text = 1,
+        /** Window caption horizontal margin */
+        wdecor_cap_hmargin = 4,
+        /** Window caption horizontal margin in text mode */
+        wdecor_cap_hmargin_text = 1,
         /** Close button cross leg length */
         wdecor_close_cross_n = 5,
@@ -326 +330 @@
                 fmt.halign = gfx_halign_center;
                 fmt.valign = gfx_valign_center;
-
-                pos.x = (trect.p0.x + trect.p1.x) / 2;
-                pos.y = (trect.p0.y + trect.p1.y) / 2;
+                fmt.abbreviate = true;
+                fmt.width = geom.caption_rect.p1.x -
+                    geom.caption_rect.p0.x;
+
+                pos.x = (geom.caption_rect.p0.x + geom.caption_rect.p1.x) / 2;
+                pos.y = (geom.caption_rect.p0.y + geom.caption_rect.p1.y) / 2;
 
                 if (wdecor->res->textmode) {
@@ -450 +457 @@
         gfx_coord_t btn_x;
         gfx_coord_t btn_y;
+        gfx_coord_t cap_hmargin;
 
         /* Does window have a frame? */
@@ -529 +537 @@
                         geom->btn_max_rect.p1.x = btn_x;
                         geom->btn_max_rect.p1.y = btn_y + 20;
+
+                        btn_x -= 20;
                 } else {
                         geom->btn_max_rect.p0.x = btn_x - 3;
@@ -534 +544 @@
                         geom->btn_max_rect.p1.x = btn_x;
                         geom->btn_max_rect.p1.y = btn_y + 1;
+
+                        btn_x -= 3;
                 }
         } else {
@@ -541 +553 @@
                 geom->btn_max_rect.p1.y = 0;
         }
+
+        if (wdecor->res->textmode == false)
+                cap_hmargin = wdecor_cap_hmargin;
+        else
+                cap_hmargin = wdecor_cap_hmargin_text;
+
+        geom->caption_rect.p0.x = geom->title_bar_rect.p0.x +
+            cap_hmargin;
+        geom->caption_rect.p0.y = geom->title_bar_rect.p0.y;
+        geom->caption_rect.p1.x = btn_x - cap_hmargin;
+        geom->caption_rect.p1.y = geom->title_bar_rect.p1.y;
 }