chore: Reverted line-height changes

CatchABus · CatchABus · commit f5f140fe93e3 · 2024-11-20T20:29:41.000+02:00
diff --git a/packages/core/platforms/ios/src/UIView+NativeScript.m b/packages/core/platforms/ios/src/UIView+NativeScript.m
@@ -30,16 +30,8 @@ - (void)nativeScriptSetTextDecorationAndTransform:(NSString*)text textDecoration
         // make sure a possible previously set text alignment setting is not lost when line height is specified
         if ([self isKindOfClass:[UIButton class]]) {
             paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
-
-            if (((UIButton*)self).titleLabel.font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UIButton*)self).titleLabel.font.lineHeight;
-            }
         } else {
             paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-
-            if (((UILabel*)self).font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UILabel*)self).font.lineHeight;
-            }
         }
         
         if ([self isKindOfClass:[UILabel class]]) {
@@ -100,17 +92,9 @@ -(void)nativeScriptSetFormattedTextDecorationAndTransform:(NSDictionary*)details
         // make sure a possible previously set text alignment setting is not lost when line height is specified
         if ([self isKindOfClass:[UIButton class]]) {
             paragraphStyle.alignment = ((UIButton*)self).titleLabel.textAlignment;
-
-            if (((UIButton*)self).titleLabel.font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UIButton*)self).titleLabel.font.lineHeight;
-            }
         } else {
             // Paragraph alignment is also important for tappable spans as NSTextContainer takes it into account
             paragraphStyle.alignment = ((UILabel*)self).textAlignment;
-
-            if (((UILabel*)self).font) {
-                paragraphStyle.lineSpacing = lineHeight - ((UILabel*)self).font.lineHeight;
-            }
         }
         
         if (isLabel) {
diff --git a/packages/core/ui/text-base/index.android.ts b/packages/core/ui/text-base/index.android.ts
@@ -367,14 +367,6 @@ export class TextBase extends TextBaseCommon {
 		if (!this.formattedText) {
 			this.nativeTextViewProtected.setTextSize(value);
 
-			// Re-calculate line-height
-			if (this.lineHeight != 0) {
-				// It's done automatically for API 28+
-				if (SDK_VERSION < 28) {
-					this._setLineHeightLegacy(this.lineHeight);
-				}
-			}
-
 			// Re-calculate letter-spacing
 			if (this.letterSpacing != 0) {
 				this._updateLetterSpacing(this.letterSpacing);
@@ -494,15 +486,6 @@ export class TextBase extends TextBaseCommon {
 		}
 	}
 
-	_setLineHeightLegacy(value: number): void {
-		const dpValue = value * layout.getDisplayDensity();
-		const fontHeight = this.nativeTextViewProtected.getPaint().getFontMetricsInt(null);
-		// Actual line spacing is the diff of line height and font height
-		const lineSpacing = Math.max(dpValue - fontHeight, 0);
-
-		this.nativeTextViewProtected.setLineSpacing(lineSpacing, 1);
-	}
-
 	_updateLetterSpacing(value: number): void {
 		const emValue = value / this.fontSize;
 		org.nativescript.widgets.ViewHelper.setLetterspacing(this.nativeTextViewProtected, emValue);
