From 242afc02acd7318d7805c4aa23220f06bfcb8b23 Mon Sep 17 00:00:00 2001 From: Dimitris - Rafail Katsampas Date: Sun, 15 May 2022 17:21:12 +0000 Subject: [PATCH 1/4] fix: Incorrect font icon size convertion to device pixels. --- packages/core/image-source/index.android.ts | 8 +++----- packages/core/image-source/index.ios.ts | 9 +++------ 2 files changed, 6 insertions(+), 11 deletions(-) diff --git a/packages/core/image-source/index.android.ts b/packages/core/image-source/index.android.ts index 45542524e0..01070058d2 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 e6b71fa804..7e59490fe6 100644 --- a/packages/core/image-source/index.ios.ts +++ b/packages/core/image-source/index.ios.ts @@ -180,15 +180,12 @@ 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) { + let scaledFontSize = layout.toDevicePixels(font.fontSize); + if (!scaledFontSize) { // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar - fontSize = UIFont.labelFontSize; + scaledFontSize = UIFont.labelFontSize; } - const density = layout.getDisplayDensity(); - const scaledFontSize = fontSize * density; - const attributes = { [NSFontAttributeName]: font.getUIFont(UIFont.systemFontOfSize(scaledFontSize)), }; From 56b425c7083933b5af95a6761db36323f75b24ed Mon Sep 17 00:00:00 2001 From: Dimitris - Rafail Katsampas Date: Sun, 15 May 2022 23:15:43 +0300 Subject: [PATCH 2/4] fix: Added missing ios conversion to pixels. --- packages/core/image-source/index.ios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts index 7e59490fe6..a3e2f06abc 100644 --- a/packages/core/image-source/index.ios.ts +++ b/packages/core/image-source/index.ios.ts @@ -183,7 +183,7 @@ export class ImageSource implements ImageSourceDefinition { let scaledFontSize = layout.toDevicePixels(font.fontSize); if (!scaledFontSize) { // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar - scaledFontSize = UIFont.labelFontSize; + scaledFontSize = layout.toDevicePixels(UIFont.labelFontSize); } const attributes = { From 3dca2c0f304fc2c6a1b492b0671df5f0c3b90d90 Mon Sep 17 00:00:00 2001 From: Dimitris - Rafail Katsampas Date: Mon, 16 May 2022 00:18:42 +0300 Subject: [PATCH 3/4] fix: Font size was not scaled in iOS. --- packages/core/image-source/index.ios.ts | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts index a3e2f06abc..45e6d32888 100644 --- a/packages/core/image-source/index.ios.ts +++ b/packages/core/image-source/index.ios.ts @@ -187,7 +187,7 @@ export class ImageSource implements ImageSourceDefinition { } const attributes = { - [NSFontAttributeName]: font.getUIFont(UIFont.systemFontOfSize(scaledFontSize)), + [NSFontAttributeName]: font.withFontSize(scaledFontSize).getUIFont(UIFont.systemFontOfSize(scaledFontSize)), }; if (color) { From bb98c1862d63c549eb5d40765c4f51c3e8af7595 Mon Sep 17 00:00:00 2001 From: Dimitris - Rafail Katsampas Date: Mon, 16 May 2022 00:42:41 +0300 Subject: [PATCH 4/4] chore: Removed font icon size pixel conversion from iOS as it's not needed. --- packages/core/image-source/index.ios.ts | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-) diff --git a/packages/core/image-source/index.ios.ts b/packages/core/image-source/index.ios.ts index 45e6d32888..fd8fbf6df4 100644 --- a/packages/core/image-source/index.ios.ts +++ b/packages/core/image-source/index.ios.ts @@ -180,14 +180,10 @@ export class ImageSource implements ImageSourceDefinition { static fromFontIconCodeSync(source: string, font: Font, color: Color): ImageSource { font = font || Font.default; - let scaledFontSize = layout.toDevicePixels(font.fontSize); - if (!scaledFontSize) { - // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar - scaledFontSize = layout.toDevicePixels(UIFont.labelFontSize); - } + // TODO: Consider making 36 font size as default for optimal look on TabView and ActionBar const attributes = { - [NSFontAttributeName]: font.withFontSize(scaledFontSize).getUIFont(UIFont.systemFontOfSize(scaledFontSize)), + [NSFontAttributeName]: font.getUIFont(UIFont.systemFontOfSize(UIFont.labelFontSize)), }; if (color) {