summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorrina6350.you <rina6350.you@samsung.com>2017-06-16 11:26:01 (GMT)
committerKangho Hur <kangho.hur@samsung.com>2017-07-10 02:11:27 (GMT)
commit7b35d0ad9c9f0441d11e7d15c37e4ce3cff1e7f5 (patch)
treebc9023ca20eb3f272992f4ce8c8932a9e8ea027d
parent7be2733abe891f4aa814e9f1cbea10e31358f56d (diff)
downloadxamarin-forms-7b35d0ad9c9f0441d11e7d15c37e4ce3cff1e7f5.zip
xamarin-forms-7b35d0ad9c9f0441d11e7d15c37e4ce3cff1e7f5.tar.gz
xamarin-forms-7b35d0ad9c9f0441d11e7d15c37e4ce3cff1e7f5.tar.bz2
Fixed the LineBreakMode issue
- temporary way Change-Id: I3d3ddca8b54e0225172af84c1d6a296a302530bd
-rwxr-xr-x[-rw-r--r--]Xamarin.Forms.Platform.Tizen/Native/Label.cs5
-rwxr-xr-x[-rw-r--r--]Xamarin.Forms.Platform.Tizen/Native/Span.cs10
2 files changed, 9 insertions, 6 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Label.cs b/Xamarin.Forms.Platform.Tizen/Native/Label.cs
index 8d09536..b508b21 100644..100755
--- a/Xamarin.Forms.Platform.Tizen/Native/Label.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Label.cs
@@ -235,10 +235,7 @@ namespace Xamarin.Forms.Platform.Tizen.Native
IsEllipsis = true;
break;
}
- if (IsEllipsis || previousMode >= LineBreakMode.HeadTruncation)
- {
- ApplyTextAndStyle();
- }
+ ApplyTextAndStyle();
}
}
}
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Span.cs b/Xamarin.Forms.Platform.Tizen/Native/Span.cs
index 3b410ba..3ffea25 100644..100755
--- a/Xamarin.Forms.Platform.Tizen/Native/Span.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Span.cs
@@ -244,12 +244,18 @@ namespace Xamarin.Forms.Platform.Tizen.Native
case LineBreakMode.TailTruncation:
_formattingString.Append("ellipsis=1.0");
break;
-
- case LineBreakMode.NoWrap:
case LineBreakMode.CharacterWrap:
+ _formattingString.Append("wrap=char");
+ break;
case LineBreakMode.WordWrap:
+ _formattingString.Append("wrap=word");
+ break;
case LineBreakMode.MixedWrap:
+ _formattingString.Append("wrap=mixed");
+ break;
+ case LineBreakMode.NoWrap:
case LineBreakMode.None:
+ _formattingString.Append("wrap=none");
break;
}