Skip to content

Commit da84135

Browse files
committed
fix: set the font size without considering the screen density
1 parent 8077617 commit da84135

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

android/src/main/java/com/jimmydaddy/imagemarker/base/TextStyle.kt

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,7 @@ data class TextStyle(val options: ReadableMap?) {
1111
var shadowLayerStyle: ShadowLayerStyle?
1212
var textBackgroundStyle: TextBackgroundStyle?
1313
var underline: Boolean = if (options?.hasKey("underline") == true) options.getBoolean("underline") else false
14-
var skewX: Float? = if (options?.hasKey("skewX") == true) options.getDouble("skewX")?.toFloat() else 0f
14+
var skewX: Float? = if (options?.hasKey("skewX") == true) options.getDouble("skewX").toFloat() else 0f
1515
var strikeThrough: Boolean = if (options?.hasKey("strikeThrough") == true) options.getBoolean("strikeThrough") else false
1616
var textAlign: Align
1717
var italic: Boolean = if (options?.hasKey("italic") == true) options.getBoolean("italic") else false

ios/RCTImageMarker/TextStyle.swift

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,7 @@ class TextStyle: NSObject {
3030
self.shadow = nil
3131
}
3232
self.textBackground = try TextBackground(textBackgroundStyle: (opts["textBackgroundStyle"] as? [AnyHashable : Any]))
33-
let scale = UIScreen.main.scale
34-
let fontSize = opts["fontSize"] != nil ? (RCTConvert.cgFloat(opts["fontSize"]) * scale) : (14.0 * scale)
33+
let fontSize = opts["fontSize"] != nil ? RCTConvert.cgFloat(opts["fontSize"]) : 14.0
3534
self.font = UIFont(name: opts["fontName"] as? String ?? "", size: fontSize)
3635
if self.font == nil {
3736
self.font = UIFont.systemFont(ofSize: fontSize)

0 commit comments

Comments
 (0)