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

mac: load emoji font last so it is not preferred for text

Browse Source
This commit is contained in:
Mitchell Hashimoto
2022-10-31 09:44:19 -07:00
parent 7557b7b831
commit 19f003d7d0
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
src/Window.zig
View File

@ -303,21 +303,6 @@ pub fn create(alloc: Allocator, loop: libuv.Loop, config: *const Config) !*Windo
}
}
// If we're on Mac, then we try to use the Apple Emoji font for Emoji.
if (builtin.os.tag == .macos and font.Discover != void) {
var disco = font.Discover.init();
defer disco.deinit();
var disco_it = try disco.discover(.{
.family = "Apple Color Emoji",
.size = font_size.points,
});
defer disco_it.deinit();
if (try disco_it.next()) |face| {
log.debug("font emoji: {s}", .{try face.name()});
try group.addFace(alloc, .regular, face);
}
}
// Our built-in font will be used as a backup
try group.addFace(
alloc,
@ -345,6 +330,21 @@ pub fn create(alloc: Allocator, loop: libuv.Loop, config: *const Config) !*Windo
);
}
// If we're on Mac, then we try to use the Apple Emoji font for Emoji.
if (builtin.os.tag == .macos and font.Discover != void) {
var disco = font.Discover.init();
defer disco.deinit();
var disco_it = try disco.discover(.{
.family = "Apple Color Emoji",
.size = font_size.points,
});
defer disco_it.deinit();
if (try disco_it.next()) |face| {
log.debug("font emoji: {s}", .{try face.name()});
try group.addFace(alloc, .regular, face);
}
}
break :group group;
});
errdefer font_group.deinit(alloc);