Skip to content

fix: Incorrect font icon size conversion to device pixels. #9910

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
May 18, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 3 additions & 5 deletions packages/core/image-source/index.android.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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();
Expand Down
11 changes: 2 additions & 9 deletions packages/core/image-source/index.ios.ts
Original file line number Diff line number Diff line change
Expand Up @@ -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) {
Expand Down