From d3718e5e5f6e6b241b2dec392cf53e65e869d6f5 Mon Sep 17 00:00:00 2001 From: Dimitris-Rafail Katsampas Date: Wed, 18 May 2022 23:28:58 +0300 Subject: [PATCH] fix: incorrect font icon size conversion to device pixels. (#9910) --- packages/core/image-source/index.android.ts | 8 +++----- packages/core/image-source/index.ios.ts | 11 ++--------- 2 files changed, 5 insertions(+), 14 deletions(-) diff --git a/packages/core/image-source/index.android.ts b/packages/core/image-source/index.android.ts index 45542524e..01070058d 100644 --- a/packages/core/image-source/index.android.ts +++ b/packages/core/image-source/index.android.ts @@ -187,14 +187,12 @@ export class ImageSource implements ImageSourceDefinition { paint.setColor(color.android); } - let fontSize = layout.toDevicePixels(font.fontSize); - if (!fontSize) { + let scaledFontSize = layout.toDevicePixels(font.fontSize); + if (!scaledFontSize) { // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar - fontSize = paint.getTextSize(); + scaledFontSize = layout.toDevicePixels(paint.getTextSize()); } - const density = layout.getDisplayDensity(); - const scaledFontSize = fontSize * density; paint.setTextSize(scaledFontSize); const textBounds = new android.graphics.Rect(); diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts index e6b71fa80..fd8fbf6df 100644 --- a/packages/core/image-source/index.ios.ts +++ b/packages/core/image-source/index.ios.ts @@ -180,17 +180,10 @@ export class ImageSource implements ImageSourceDefinition { static fromFontIconCodeSync(source: string, font: Font, color: Color): ImageSource { font = font || Font.default; - let fontSize = layout.toDevicePixels(font.fontSize); - if (!fontSize) { - // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar - fontSize = UIFont.labelFontSize; - } - - const density = layout.getDisplayDensity(); - const scaledFontSize = fontSize * density; + // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar const attributes = { - [NSFontAttributeName]: font.getUIFont(UIFont.systemFontOfSize(scaledFontSize)), + [NSFontAttributeName]: font.getUIFont(UIFont.systemFontOfSize(UIFont.labelFontSize)), }; if (color) {