From 18f0bc4c844bc449a54ed5359c288e224cd2f412 Mon Sep 17 00:00:00 2001 From: "gcp-cherry-pick-bot[bot]" <98988430+gcp-cherry-pick-bot[bot]@users.noreply.github.com> Date: Fri, 12 Apr 2024 14:20:56 -0600 Subject: [PATCH] Fix emojis when rendering with the system ui font (cherry-pick #10491) (#10493) Cherry-picked Fix emojis when rendering with the system ui font (#10491) Release Notes: - N/A Co-authored-by: Conrad Irwin --- crates/gpui/src/platform/mac/text_system.rs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/crates/gpui/src/platform/mac/text_system.rs b/crates/gpui/src/platform/mac/text_system.rs index 2892b517da58c2360b3a0e28bc4c8ef89a7be4b5..64ba6cbd36c5032a702f85aa400530f47c0dcd60 100644 --- a/crates/gpui/src/platform/mac/text_system.rs +++ b/crates/gpui/src/platform/mac/text_system.rs @@ -334,7 +334,7 @@ impl MacTextSystemState { self.postscript_names_by_font_id .get(&font_id) .map_or(false, |postscript_name| { - postscript_name == "AppleColorEmoji" + postscript_name == "AppleColorEmoji" || postscript_name == ".AppleColorEmojiUI" }) }