Changeset 68d68e9 in mainline for uspace/lib/ui/src/pbutton.c

Timestamp:

2022-11-23T12:50:27Z (17 months ago)

Author:

Jiri Svoboda <jiri@…>

Branches:

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

Children:

c4a53280

Parents:

6e91475

Message:

Vary window button size to fit

If they get too narrow, we stop adding more buttons.

File:

• uspace/lib/ui/src/pbutton.c (modified) (5 diffs)

uspace/lib/ui/src/pbutton.c

@@ -54 +54 @@
 enum {
         ui_pb_press_dx = 1,
-        ui_pb_press_dy = 1
+        ui_pb_press_dy = 1,
+        ui_pb_pad_x = 2,
+        ui_pb_pad_x_text = 1
 };
 
@@ -323 +325 @@
         gfx_text_fmt_t fmt;
         gfx_rect_t rect;
+        gfx_rect_t irect;
         gfx_coord_t thickness;
         bool depressed;
@@ -360 +363 @@
         } else {
                 /* Text decoration */
+                ui_paint_get_inset_frame_inside(pbutton->res, &rect, &irect);
                 gfx_text_fmt_init(&fmt);
                 fmt.font = pbutton->res->font;
@@ -365 +369 @@
                 fmt.halign = gfx_halign_center;
                 fmt.valign = gfx_valign_center;
+                fmt.abbreviate = true;
+                fmt.width = irect.p1.x - irect.p0.x - 2 * ui_pb_pad_x;
 
                 rc = gfx_puttext(&pos, &fmt, pbutton->caption);
@@ -442 +448 @@
         fmt.halign = gfx_halign_center;
         fmt.valign = gfx_valign_center;
+        fmt.abbreviate = true;
+        fmt.width = rect.p1.x - rect.p0.x - 2 * ui_pb_pad_x_text;
 
         rc = gfx_puttext(&pos, &fmt, pbutton->caption);