Skip to content
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

#868 Add consistency to resolving of style and width between different modes. #869

Open
wants to merge 1 commit into
base: open-dev-v1
Choose a base branch
from
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -115,10 +115,11 @@ public GVTFontFamily getDefault() {

private Float getStyle(IdentValue fontStyle) {
if (fontStyle == IdentValue.ITALIC ||
fontStyle == IdentValue.OBLIQUE)
fontStyle == IdentValue.OBLIQUE) {
return TextAttribute.POSTURE_OBLIQUE;

return null;
}

return 0f;
}

private Float getStyle(FontStyle style) {
Expand Down Expand Up @@ -171,7 +172,7 @@ private Float getWeight(IdentValue weight) {
} else if (weight == IdentValue.FONT_WEIGHT_300) {
return TextAttribute.WEIGHT_LIGHT;
} else if (weight == IdentValue.FONT_WEIGHT_400) {
return TextAttribute.WEIGHT_MEDIUM;
return TextAttribute.WEIGHT_REGULAR;
} else if (weight == IdentValue.FONT_WEIGHT_500) {
return TextAttribute.WEIGHT_SEMIBOLD;
} else if (weight == IdentValue.FONT_WEIGHT_600) {
Expand Down