summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorSeungkeun Lee <sngn.lee@samsung.com>2017-04-04 07:58:12 (GMT)
committerSeungkeun Lee <sngn.lee@samsung.com>2017-04-04 08:06:48 (GMT)
commit5e828471918bb78da16d28a640a04edc7ed7019b (patch)
tree6855f7c36e80b04f7eca14810cb8c1390fc17c76
parent8e757e12b8a99c99ae65fa2acc46861716d84096 (diff)
downloadxamarin-forms-5e828471918bb78da16d28a640a04edc7ed7019b.zip
xamarin-forms-5e828471918bb78da16d28a640a04edc7ed7019b.tar.gz
xamarin-forms-5e828471918bb78da16d28a640a04edc7ed7019b.tar.bz2
Fix Label layout issuerefs/changes/33/123033/1
- TCAPI-2251 - This issuse was caused by wrong minimum size - Layout class was depend on request size and minium size to layouting If minium size was (0,0) layout will resize to smaller than request size So, Label should be set proper minimum size Change-Id: I895c32d26ca7b090b185f5ff3793638cec6229a2
-rw-r--r--Xamarin.Forms.Platform.Tizen/Native/Label.cs16
-rw-r--r--Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs2
2 files changed, 2 insertions, 16 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Native/Label.cs b/Xamarin.Forms.Platform.Tizen/Native/Label.cs
index a75e6aa..b81a24e 100644
--- a/Xamarin.Forms.Platform.Tizen/Native/Label.cs
+++ b/Xamarin.Forms.Platform.Tizen/Native/Label.cs
@@ -312,32 +312,18 @@ namespace Xamarin.Forms.Platform.Tizen.Native
Resize(availableWidth, size.Height);
- var rawSize = Native.TextHelper.GetRawTextBlockSize(this);
var formattedSize = Native.TextHelper.GetFormattedTextBlockSize(this);
Resize(size.Width, size.Height);
// Set bottom padding for lower case letters that have segments below the bottom line of text (g, j, p, q, y).
var verticalPadding = (int)Math.Ceiling(0.05 * FontSize);
- rawSize.Height += verticalPadding;
formattedSize.Height += verticalPadding;
// This is the EFL team's guide.
// For wrap to work properly, the label must be 1 pixel larger than the size of the formatted text.
- rawSize.Width += 1;
formattedSize.Width += 1;
- if (rawSize.Width > availableWidth)
- {
- return new ESize()
- {
- Width = formattedSize.Width,
- Height = Math.Min(formattedSize.Height, Math.Max(rawSize.Height, availableHeight)),
- };
- }
- else
- {
- return formattedSize;
- }
+ return formattedSize;
}
void ApplyTextAndStyle()
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs
index 49611e4..be5de86 100644
--- a/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs
+++ b/Xamarin.Forms.Platform.Tizen/Renderers/LabelRenderer.cs
@@ -44,7 +44,7 @@ namespace Xamarin.Forms.Platform.Tizen
protected override Size MinimumSize()
{
- return new Size(Control.MinimumWidth, Control.MinimumHeight);
+ return Control.Measure(Control.MinimumWidth, Control.MinimumHeight).ToDP();
}
Native.FormattedString ConvertFormattedText(FormattedString formattedString)