summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungkeun Lee <sngn.lee@samsung.com>2017-01-04 05:01:48 (GMT)
committerKangho Hur <kangho.hur@samsung.com>2017-03-24 04:18:58 (GMT)
commite0ddba84cc75f834fe4d5fc4bacc6b27f1c87021 (patch)
tree752a2f24845f01199c33cf20530b41f33a37f857
parent475d120aebd066d11b943080b03e06b0cc78f70d (diff)
downloadxamarin-forms-e0ddba84cc75f834fe4d5fc4bacc6b27f1c87021.zip
xamarin-forms-e0ddba84cc75f834fe4d5fc4bacc6b27f1c87021.tar.gz
xamarin-forms-e0ddba84cc75f834fe4d5fc4bacc6b27f1c87021.tar.bz2
Support Density Independent Pixel on FontSize
- FontSize on Span was use DP unit Change-Id: I1a0a50dbeae3ede0c61a67f60f7238631684537d
-rw-r--r--Xamarin.Forms.Platform.Tizen/Forms.cs13
-rw-r--r--Xamarin.Forms.Platform.Tizen/Native/Span.cs2
-rw-r--r--Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs8
3 files changed, 17 insertions, 6 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Forms.cs b/Xamarin.Forms.Platform.Tizen/Forms.cs
index 34828a4..453bab8 100644
--- a/Xamarin.Forms.Platform.Tizen/Forms.cs
+++ b/Xamarin.Forms.Platform.Tizen/Forms.cs
@@ -11,6 +11,12 @@ namespace Xamarin.Forms.Platform.Tizen
{
public static class Forms
{
+ static Lazy<int> s_dpi = new Lazy<int>(() =>
+ {
+ int dpi = 0;
+ TSystemInfo.TryGetValue<int>("http://tizen.org/feature/screen.dpi", out dpi);
+ return dpi;
+ });
class TizenDeviceInfo : DeviceInfo
{
readonly Size pixelScreenSize;
@@ -178,6 +184,11 @@ namespace Xamarin.Forms.Platform.Tizen
// TODO: implement me
return Color.Black;
}
+
+ internal static int ConvertToPixel(double dp)
+ {
+ return (int)Math.Round(dp * s_dpi.Value / 160.0);
+ }
}
class TizenExpressionSearch : ExpressionVisitor, IExpressionSearch
@@ -206,4 +217,4 @@ namespace Xamarin.Forms.Platform.Tizen
return base.VisitMember(node);
}
}
-} \ No newline at end of file
+}
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Span.cs b/Xamarin.Forms.Platform.Tizen/Native/Span.cs
index 7ac4134..0e3f000 100644
--- a/Xamarin.Forms.Platform.Tizen/Native/Span.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Span.cs
@@ -175,7 +175,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native
if (FontSize != -1)
{
- _formattingString.AppendFormat("font_size={0} ", FontSize);
+ _formattingString.AppendFormat("font_size={0} ", Forms.ConvertToPixel(FontSize));
}
if ((FontAttributes & FontAttributes.Bold) != 0)
diff --git a/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs b/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs
index 7d44231..db7ee1d 100644
--- a/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs
+++ b/Xamarin.Forms.Platform.Tizen/TizenPlatformServices.cs
@@ -82,14 +82,14 @@ namespace Xamarin.Forms.Platform.Tizen
switch (size)
{
case NamedSize.Micro:
- return 16;
+ return 10;
case NamedSize.Small:
- return 20;
+ return 12;
case NamedSize.Default:
case NamedSize.Medium:
- return 24;
+ return 14;
case NamedSize.Large:
- return 30;
+ return 18;
default:
throw new ArgumentOutOfRangeException();
}