From a3f997dfda28ed37b043fe3acd6abdeb2e3614af Mon Sep 17 00:00:00 2001 From: PP Date: Thu, 14 Apr 2022 16:42:40 +0800 Subject: [PATCH] optimize text baseline on runtime platform (#10751) * optimize text baseline on runtime platform * move into minigame module --- @types/pal/minigame.d.ts | 18 ++++++++++++++++++ cocos/2d/utils/text-utils.ts | 18 ++++++++++++++++++ pal/minigame/runtime.ts | 1 + 3 files changed, 37 insertions(+) diff --git a/@types/pal/minigame.d.ts b/@types/pal/minigame.d.ts index 45a07ef8af..60069d722c 100644 --- a/@types/pal/minigame.d.ts +++ b/@types/pal/minigame.d.ts @@ -4,6 +4,7 @@ declare module 'pal/minigame' { // platform related wx?: WeChatAPI; tt?: ByteDanceAPI; + ral?: RuntimeAPI; // system isDevTool: boolean; @@ -82,6 +83,23 @@ declare module 'pal/minigame' { deltaY: number; deltaZ: number; } + + interface ICANVAS_CONTEXT2D_TEXTBASELINE_ALPHABETIC { + name: string, + enable: number, + } + interface ICANVAS_CONTEXT2D_TEXTBASELINE_DEFAULT { + name: string, + alphabetic: number, + } + + interface RuntimeAPI { + CANVAS_CONTEXT2D_TEXTBASELINE_ALPHABETIC: ICANVAS_CONTEXT2D_TEXTBASELINE_ALPHABETIC, + CANVAS_CONTEXT2D_TEXTBASELINE_DEFAULT: ICANVAS_CONTEXT2D_TEXTBASELINE_DEFAULT, + getFeaturePropertyInt(featureName: string): number; + setFeaturePropertyInt(featureName: string, value: number); + } + interface ByteDanceAPI { getAudioContext?: () => AudioContext; } diff --git a/cocos/2d/utils/text-utils.ts b/cocos/2d/utils/text-utils.ts index 10b15a7561..ff4ec37c3a 100644 --- a/cocos/2d/utils/text-utils.ts +++ b/cocos/2d/utils/text-utils.ts @@ -25,12 +25,30 @@ */ import { RUNTIME_BASED } from 'internal:constants'; +import { minigame } from 'pal/minigame'; import Pool from '../../core/utils/pool'; export const BASELINE_RATIO = 0.26; let _BASELINE_OFFSET = 0; + if (RUNTIME_BASED) { _BASELINE_OFFSET = BASELINE_RATIO * 2 / 3; + + const ral = minigame.ral!; + const featureAlphabeticeName = ral.CANVAS_CONTEXT2D_TEXTBASELINE_ALPHABETIC.name; + const featureAlphabeticEnable = ral.CANVAS_CONTEXT2D_TEXTBASELINE_ALPHABETIC.enable; + + const defaultBaselineName = ral.CANVAS_CONTEXT2D_TEXTBASELINE_DEFAULT.name; + const defaultIsAlphaBetic = ral.CANVAS_CONTEXT2D_TEXTBASELINE_DEFAULT.alphabetic; + + if (ral.getFeaturePropertyInt(featureAlphabeticeName) === featureAlphabeticEnable) { + // if support alphabetic baseline, set default baseline to alphabetic + ral.setFeaturePropertyInt(defaultBaselineName, defaultIsAlphaBetic); + if (ral.getFeaturePropertyInt(defaultBaselineName) === defaultIsAlphaBetic) { + // if default baseline has been successfully set to alphabetic, _BASELINE_OFFSET should be 0. + _BASELINE_OFFSET = 0; + } + } } export const MIDDLE_RATIO = (BASELINE_RATIO + 1) / 2 - BASELINE_RATIO; export function getBaselineOffset () { diff --git a/pal/minigame/runtime.ts b/pal/minigame/runtime.ts index 23d5fe2106..8719c798e4 100644 --- a/pal/minigame/runtime.ts +++ b/pal/minigame/runtime.ts @@ -9,6 +9,7 @@ declare let ral: any; // @ts-expect-error can't init minigame when it's declared const minigame: IMiniGame = {}; cloneObject(minigame, ral); +minigame.ral = ral; // #region SystemInfo const systemInfo = minigame.getSystemInfoSync();