fix: max scale factor works as intended on android

unoplatform · May 13, 2022 · 63b2944 · 63b2944
1 parent 0e09483
commit 63b2944
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 4 deletions.
diff --git a/src/Uno.UI/Controls/UIFontHelper.iOS.cs b/src/Uno.UI/Controls/UIFontHelper.iOS.cs
@@ -65,7 +65,11 @@ private static nfloat GetScaledFontSize(nfloat size, nfloat? basePreferredSize)
 			}
 
 			var originalScale = (basePreferredSize / DefaultUIFontPreferredBodyFontSize) ?? (float)1.0;
-			return size * Math.Min((float)originalScale, (float)FeatureConfiguration.Font.MaximumTextScaleFactor);
+			if (FeatureConfiguration.Font.MaximumTextScaleFactor is float scaleFactor)
+			{
+				return size * Math.Min(originalScale, scaleFactor);
+			}
+			return size * originalScale;
 		}
 
 		private static UIFont InternalTryGetFont(nfloat size, FontWeight fontWeight, FontStyle fontStyle, FontFamily requestedFamily, nfloat? basePreferredSize)

diff --git a/src/Uno.UI/Extensions/ViewHelper.Android.cs b/src/Uno.UI/Extensions/ViewHelper.Android.cs
@@ -467,9 +467,9 @@ private static void AdjustScaledDensity(Android.Util.DisplayMetrics displayMetri
 				// https://developer.xamarin.com/api/property/Android.Util.DisplayMetrics.ScaledDensity/
 				displayMetrics.ScaledDensity = displayMetrics.Density;
 			}
-			else
+			else if (FeatureConfiguration.Font.MaximumTextScaleFactor is float scaleFactor)
 			{
-				displayMetrics.ScaledDensity = Math.Min(displayMetrics.ScaledDensity, (float)FeatureConfiguration.Font.MaximumTextScaleFactor);
+				displayMetrics.ScaledDensity = Math.Min(displayMetrics.ScaledDensity, scaleFactor * displayMetrics.Density);
 			}
 		}
 	}

diff --git a/src/Uno.UI/FeatureConfiguration.cs b/src/Uno.UI/FeatureConfiguration.cs
@@ -183,7 +183,7 @@ public static class Font
 			/// <summary>
 			/// Allows the user to limit the scale factor without having to ignore it.
 			/// </summary>
-			public static double? MaximumTextScaleFactor { get; set; }
+			public static float? MaximumTextScaleFactor { get; set; }
 #endif
 		}