sambruk/excalidraw
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix display of some emoji on Windows (#1933)

Browse Source
This commit is contained in:
Herb Caudill 2020-07-19 21:14:45 +02:00 committed by GitHub
parent e2640edb79
commit 29f803e25d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 8 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/constants.ts
View File

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

8
src/utils.ts
View File

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