From 155a6d1114a8ebf6488eb9b9274789cfd437285d Mon Sep 17 00:00:00 2001 From: Qwerasd Date: Mon, 8 Apr 2024 20:44:17 -0400 Subject: [PATCH] font: fix discovery of styles These are meant to be absolute indexes, make it so. --- src/font/SharedGridSet.zig | 13 +++++++++---- 1 file changed, 9 insertions(+), 4 deletions(-) diff --git a/src/font/SharedGridSet.zig b/src/font/SharedGridSet.zig index 8295993a3..bcb2d1095 100644 --- a/src/font/SharedGridSet.zig +++ b/src/font/SharedGridSet.zig @@ -521,14 +521,19 @@ pub const Key = struct { break :set set; }; + const regular_offset = config.@"font-family".list.items.len; + const bold_offset = regular_offset + config.@"font-family-bold".list.items.len; + const italic_offset = bold_offset + config.@"font-family-italic".list.items.len; + const bold_italic_offset = italic_offset + config.@"font-family-bold-italic".list.items.len; + return .{ .arena = arena, .descriptors = try descriptors.toOwnedSlice(), .style_offsets = .{ - config.@"font-family".list.items.len, - config.@"font-family-bold".list.items.len, - config.@"font-family-italic".list.items.len, - config.@"font-family-bold-italic".list.items.len, + regular_offset, + bold_offset, + italic_offset, + bold_italic_offset, }, .codepoint_map = codepoint_map, .metric_modifiers = metric_modifiers,