Преглед на файлове

Fix display of some emoji on Windows (#1933)

Herb Caudill преди 5 години
родител
ревизия
29f803e25d
променени са 2 файла, в които са добавени 8 реда и са изтрити 2 реда
  1. 2 0
      src/constants.ts
  2. 6 2
      src/utils.ts

+ 2 - 0
src/constants.ts

@@ -70,6 +70,8 @@ export const FONT_FAMILY = {
   3: "Cascadia",
 } as const;
 
+export const WINDOWS_EMOJI_FALLBACK_FONT = "Segoe UI Emoji";
+
 export const DEFAULT_FONT_SIZE = 20;
 export const DEFAULT_FONT_FAMILY: FontFamily = 1;
 export const DEFAULT_TEXT_ALIGN = "left";

+ 6 - 2
src/utils.ts

@@ -1,6 +1,10 @@
 import { FlooredNumber } from "./types";
 import { getZoomOrigin } from "./scene";
-import { CURSOR_TYPE, FONT_FAMILY } from "./constants";
+import {
+  CURSOR_TYPE,
+  FONT_FAMILY,
+  WINDOWS_EMOJI_FALLBACK_FONT,
+} from "./constants";
 import { FontFamily, FontString } from "./element/types";
 
 export const SVG_NS = "http://www.w3.org/2000/svg";
@@ -66,7 +70,7 @@ export const getFontFamilyString = ({
 }: {
   fontFamily: FontFamily;
 }) => {
-  return FONT_FAMILY[fontFamily];
+  return `${FONT_FAMILY[fontFamily]}, ${WINDOWS_EMOJI_FALLBACK_FONT}`;
 };
 
 /** returns fontSize+fontFamily string for assignment to DOM elements */