Fix text centring layout issue

Author: loftafi

build.zig.zon

@@ -1,6 +1,6 @@
 .{
     .name = .engine,
-    .version = "0.10.6",
+    .version = "0.11.0",
     .fingerprint = 0xe8a81a8d0aa558d5,
     .minimum_zig_version = "0.15.2",
     .dependencies = .{

src/checkbox.zig

@@ -59,7 +59,7 @@ pub fn Checkbox(comptime T: type) type {
                 .shrinks, .grows => {
                     // Growing or shrinking, our task here is to find
                     // the minimum that would be needed.
-                    element.layout_label(display.scale, parent_inner_width);
+                    _ = element.layout_label(display.scale, parent_inner_width);
                     //err("{s} {s} use width {d}", .{ self.name, @tagName(self.type), choose });
                     return element.rect.width + element.pad.left + element.type.checkbox.checkbox_size.width;
                 },
@@ -81,7 +81,7 @@ pub fn Checkbox(comptime T: type) type {
             // needs to be done here as the width of the label may have changed.
             switch (element.layout.y) {
                 .shrinks, .grows => {
-                    element.layout_label(display.scale, parent_inner_width);
+                    _ = element.layout_label(display.scale, parent_inner_width);
                     //err("{s} {s} use grows height {d} (parent_width={d})", .{ self.name, @tagName(self.type), mm.max_height, parent_width });
                     return element.rect.height;
                 },

src/element.zig

@@ -369,14 +369,14 @@ pub fn Element(comptime T: type) type {
                 });
             }
             if (self.style != .normal) {
-                _ = try out.write(" align=");
+                _ = try out.write(" style=");
                 _ = try out.write(@tagName(self.style));
             }
             if (self.child_align.x != .start or self.child_align.y != .start) {
                 _ = try out.write(" align=");
-                _ = try out.write(@tagName(self.layout.x));
+                _ = try out.write(@tagName(self.child_align.x));
                 _ = try out.write("-");
-                _ = try out.write(@tagName(self.layout.y));
+                _ = try out.write(@tagName(self.child_align.y));
             }
             _ = try out.write(" layout=");
             _ = try out.write(@tagName(self.layout.x));
@@ -1216,17 +1216,18 @@ pub fn Element(comptime T: type) type {
         /// by a certain offset amount.
         ///
         /// `parent_inner_width` should be the actual width the parent is
-        /// passing down to this child element, minus left and right padding, and
-        /// clamped to the min/max width (including padding)
+        /// willing/able to down to this child element, minus the parent
+        /// left and right padding, and clamped to the min/max
+        /// width (including padding)
         pub inline fn layout_label(
             element: *Self,
             display_scale: f32,
             parent_inner_width: f32,
-        ) void {
+        ) f32 {
             std.debug.assert(element.type == .label or element.type == .checkbox);
 
-            if (element.type == .label and element.type.label.text.len == 0) return;
-            if (element.type == .checkbox and element.type.checkbox.text.len == 0) return;
+            if (element.type == .label and element.type.label.text.len == 0) return 0;
+            if (element.type == .checkbox and element.type.checkbox.text.len == 0) return 0;
 
             const text_height = switch (element.type) {
                 .label => element.type.label.text_size,
@@ -1238,6 +1239,7 @@ pub fn Element(comptime T: type) type {
                 .checkbox => element.type.checkbox.elements.items,
                 else => unreachable,
             };
+            if (children.len == 0) return 0;
 
             // Track the minimum needed width. Remember the longest line. Include
             // any left/right padding.
@@ -1317,11 +1319,16 @@ pub fn Element(comptime T: type) type {
             );
 
             // Align words to centre or right if requested.
-            if (children.len == 0) return;
+            // centre and end alignment might need the `grows`
+            // full width, or the `shrinks` minimum width.
             if (element.child_align.x == .centre or element.child_align.x == .end) {
                 var line_start: usize = 0;
                 var line_end: usize = 0;
-                const usable_width = wrap_at;
+                const usable_width = switch (element.layout.x) {
+                    .grows => wrap_at,
+                    .shrinks => needed_width - element.pad.left - element.pad.right,
+                    .fixed => element.rect.width - element.pad.left - element.pad.right,
+                };
                 while (true) : (line_end += 1) {
                     if (line_end + 1 == children.len) {
                         element.do_word_alignment(
@@ -1343,23 +1350,7 @@ pub fn Element(comptime T: type) type {
                 }
             }
 
-            if (false) {
-                const t = switch (element.type) {
-                    .button => element.type.button.translated,
-                    .label => element.type.label.translated,
-                    .checkbox => element.type.checkbox.translated,
-                    else => "",
-                };
-                trace("label {s} {t} \"{s}\" wrap={d} need={d} selected={d} (max_parent_width={d})", .{
-                    element.name,
-                    element.layout.x,
-                    t,
-                    wrap_at,
-                    needed_width,
-                    element.rect.width,
-                    parent_inner_width,
-                });
-            }
+            return needed_width;
         }
 
         pub fn keypress(

src/label.zig

@@ -59,7 +59,7 @@ pub fn Label(comptime T: type) type {
                 .shrinks, .grows => {
                     // Growing or shrinking, our task here is to find
                     // the minimum that would be needed.
-                    element.layout_label(display.scale, allowed_width);
+                    _ = element.layout_label(display.scale, allowed_width);
                     return element.rect.width;
                 },
                 .fixed => {
@@ -89,12 +89,10 @@ pub fn Label(comptime T: type) type {
             // needs to be done here as the width of the label may have changed.
             switch (element.layout.y) {
                 .shrinks, .grows => {
-                    element.layout_label(display.scale, allowed_width);
-                    //err("{s} {s} use grows height {d} (parent_width={d})", .{ self.name, @tagName(self.type), mm.max_height, parent_width });
+                    _ = element.layout_label(display.scale, allowed_width);
                     return element.rect.height;
                 },
                 .fixed => {
-                    //err("{s} {s} use fixed height {d} (parent_width={d})", .{ self.name, @tagName(self.type), self.height, parent_width });
                     return element.rect.height;
                 },
             }