From 94542b04f2f9e958f922be7e4400e1742e617a2d Mon Sep 17 00:00:00 2001 From: Mitchell Hashimoto Date: Wed, 6 Nov 2024 12:56:12 -0800 Subject: [PATCH] font/coretext: do not set variation axes in discovery This was causing discovery to find some odd fonts under certain scenarios (namely: Recursive Mono). Due to our prior fix in e08eeb2b2ad810c4db22530a181858caee834b22 we no longer need to set variations here for them to stick. --- src/font/discovery.zig | 16 +--------------- 1 file changed, 1 insertion(+), 15 deletions(-) diff --git a/src/font/discovery.zig b/src/font/discovery.zig index 67236d5c9..e73ea626f 100644 --- a/src/font/discovery.zig +++ b/src/font/discovery.zig @@ -235,21 +235,7 @@ pub const Descriptor = struct { ); } - // Build our descriptor from attrs - var desc = try macos.text.FontDescriptor.createWithAttributes(@ptrCast(attrs)); - errdefer desc.release(); - - // Variations are built by copying the descriptor. I don't know a way - // to set it on attrs directly. - for (self.variations) |v| { - const id = try macos.foundation.Number.create(.int, @ptrCast(&v.id)); - defer id.release(); - const next = try desc.createCopyWithVariation(id, v.value); - desc.release(); - desc = next; - } - - return desc; + return try macos.text.FontDescriptor.createWithAttributes(@ptrCast(attrs)); } };