diff options
| author | Paul DiPietro <pauldipietro@users.noreply.github.com> | 2016-08-30 13:47:09 -0500 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-08-30 11:47:09 -0700 |
| commit | d8f9444ddb3e49b408a5431acf6fa43a226c434e (patch) | |
| tree | e4fc7bcde77cac87834a79c49d32b193605207b5 /Xamarin.Forms.Platform.WinRT | |
| parent | 88b15d7d1f40a19d35ed5daed16bdfe2a32adc76 (diff) | |
| download | xamarin-forms-d8f9444ddb3e49b408a5431acf6fa43a226c434e.tar.gz xamarin-forms-d8f9444ddb3e49b408a5431acf6fa43a226c434e.tar.bz2 xamarin-forms-d8f9444ddb3e49b408a5431acf6fa43a226c434e.zip | |
[Win] Fix FontAttributes unexpectedly changing a label's size (#325)
Diffstat (limited to 'Xamarin.Forms.Platform.WinRT')
| -rw-r--r-- | Xamarin.Forms.Platform.WinRT/LabelRenderer.cs | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/Xamarin.Forms.Platform.WinRT/LabelRenderer.cs b/Xamarin.Forms.Platform.WinRT/LabelRenderer.cs index 1f2f861d..3997e7e4 100644 --- a/Xamarin.Forms.Platform.WinRT/LabelRenderer.cs +++ b/Xamarin.Forms.Platform.WinRT/LabelRenderer.cs @@ -34,6 +34,7 @@ namespace Xamarin.Forms.Platform.WinRT public class LabelRenderer : ViewRenderer<Label, TextBlock> { bool _fontApplied; + bool _isInitiallyDefault; protected override Windows.Foundation.Size ArrangeOverride(Windows.Foundation.Size finalSize) { @@ -71,6 +72,8 @@ namespace Xamarin.Forms.Platform.WinRT SetNativeControl(new TextBlock()); } + _isInitiallyDefault = Element.IsDefault(); + UpdateText(Control); UpdateColor(Control); UpdateAlign(Control); @@ -134,7 +137,7 @@ namespace Xamarin.Forms.Platform.WinRT return; #pragma warning disable 618 - Font fontToApply = label.IsDefault() ? Font.SystemFontOfSize(NamedSize.Medium) : label.Font; + Font fontToApply = label.IsDefault() && _isInitiallyDefault ? Font.SystemFontOfSize(NamedSize.Medium) : label.Font; #pragma warning restore 618 textBlock.ApplyFont(fontToApply); |