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

remove the font style fallback for the fallback set

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-08-19 22:22:13 -07:00
parent 6026fdf834
commit c29f4cace6
1 changed files with 18 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
src/font/FallbackSet.zig
View File

@ -73,31 +73,31 @@ pub fn getOrAddGlyph(
// Go through each familiy and look for a matching glyph // Go through each familiy and look for a matching glyph
var fam_i: usize = 0; var fam_i: usize = 0;
const glyph = glyph: { const glyph = glyph: {
var style_current = style;
while (true) {
for (self.families.items) |*family, i| { for (self.families.items) |*family, i| {
fam_i = i; fam_i = i;
// If this family already has it loaded, return it. // If this family already has it loaded, return it.
if (family.getGlyph(v, style_current)) |glyph| break :glyph glyph; if (family.getGlyph(v, style)) |glyph| break :glyph glyph;
// Try to load it. // Try to load it.
if (family.addGlyph(alloc, v, style_current)) |glyph| if (family.addGlyph(alloc, v, style)) |glyph|
break :glyph glyph break :glyph glyph
else |err| switch (err) { else |err| switch (err) {
// TODO: this probably doesn't belong here and should
// be higher level... but how?
error.AtlasFull => {
try family.atlas.grow(alloc, family.atlas.size * 2);
break :glyph try family.addGlyph(alloc, v, style);
},
error.GlyphNotFound => {}, error.GlyphNotFound => {},
else => return err, else => return err,
} }
} }
// We never found any glyph! For our first fallback, we'll simply
// try to the non-styled variant.
if (style_current == .regular) break;
style_current = .regular;
}
// If we are regular, we use a fallback character // If we are regular, we use a fallback character
log.warn("glyph not found, using fallback. codepoint={x}", .{utf32}); log.warn("glyph not found, using fallback. codepoint={x}", .{utf32});
fam_i = 0;
break :glyph try self.families.items[0].addGlyph(alloc, ' ', style); break :glyph try self.families.items[0].addGlyph(alloc, ' ', style);
}; };