Applied-Software/ghostty
5
0
Fork 0
mirror of https://github.com/ghostty-org/ghostty.git synced 2025-07-15 00:06:09 +03:00
Code Issues Packages Projects Releases Wiki Activity

font: if variation is set for a style and style isn't found, retry reg

Browse Source
This commit is contained in:
Mitchell Hashimoto
2024-08-23 19:59:11 -07:00
parent ad22e068a2
commit 963c843d1a
1 changed files with 49 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
src/font/SharedGridSet.zig
View File

@ -187,20 +187,56 @@ fn collection(
inline for (@typeInfo(Style).Enum.fields) |field| { inline for (@typeInfo(Style).Enum.fields) |field| {
const style = @field(Style, field.name); const style = @field(Style, field.name);
for (key.descriptorsForStyle(style)) |desc| { for (key.descriptorsForStyle(style)) |desc| {
var disco_it = try disco.discover(self.alloc, desc); {
defer disco_it.deinit(); var disco_it = try disco.discover(self.alloc, desc);
if (try disco_it.next()) |face| { defer disco_it.deinit();
log.info("font {s}: {s}", .{ if (try disco_it.next()) |face| {
field.name, log.info("font {s}: {s}", .{
try face.name(&name_buf), field.name,
}); try face.name(&name_buf),
});
_ = try c.add( _ = try c.add(
self.alloc, self.alloc,
style, style,
.{ .deferred = face }, .{ .deferred = face },
); );
} else log.warn("font-family {s} not found: {s}", .{
continue;
}
}
// If there are variation configurations and we didn't find
// the font, then we retry the discovery with all stylistic
// bits set to false. This is because some fonts may not
// set the stylistic bit in their table but still support
// axes to mimic the style. At the time of writing, Berkeley
// Mono Variable is like this. See #2140.
if (style != .regular and desc.variations.len > 0) {
var disco_it = try disco.discover(self.alloc, desc: {
var copy = desc;
copy.bold = false;
copy.italic = false;
break :desc copy;
});
defer disco_it.deinit();
if (try disco_it.next()) |face| {
log.info("font {s}: {s}", .{
field.name,
try face.name(&name_buf),
});
_ = try c.add(
self.alloc,
style,
.{ .deferred = face },
);
continue;
}
}
log.warn("font-family {s} not found: {s}", .{
field.name, field.name,
desc.family.?, desc.family.?,
}); });