diff options
| author | kingces95 <kingces95@users.noreply.github.com> | 2016-04-12 11:44:30 -0700 |
|---|---|---|
| committer | Jason Smith <jason.smith@xamarin.com> | 2016-04-12 11:44:30 -0700 |
| commit | 10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba (patch) | |
| tree | b9bd7f86a3650b2fedcf762b18c25699ff44f82e /Xamarin.Forms.Core/Label.cs | |
| parent | 73defe491f11fc417a22eebcf805ee20df90045a (diff) | |
| download | xamarin-forms-10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba.tar.gz xamarin-forms-10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba.tar.bz2 xamarin-forms-10f6c08ceb89b8b302cb41dd6fe7b1ccf70884ba.zip | |
Mop up enabling warnings as errors (#78)
Diffstat (limited to 'Xamarin.Forms.Core/Label.cs')
| -rw-r--r-- | Xamarin.Forms.Core/Label.cs | 16 |
1 files changed, 16 insertions, 0 deletions
diff --git a/Xamarin.Forms.Core/Label.cs b/Xamarin.Forms.Core/Label.cs index fed021f8..d34f1176 100644 --- a/Xamarin.Forms.Core/Label.cs +++ b/Xamarin.Forms.Core/Label.cs @@ -176,11 +176,15 @@ namespace Xamarin.Forms var family = (string)values[0]; if (family != null) { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.OfSize(family, (double)values[1]).WithAttributes(attributes); +#pragma warning restore } else { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.SystemFontOfSize((double)values[1], attributes); +#pragma warning restore } label._cancelEvents = false; @@ -201,11 +205,15 @@ namespace Xamarin.Forms var family = (string)newValue; if (family != null) { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.OfSize(family, (double)values[0]).WithAttributes((FontAttributes)values[1]); +#pragma warning restore } else { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.SystemFontOfSize((double)values[0], (FontAttributes)values[1]); +#pragma warning restore } label._cancelEvents = false; @@ -226,11 +234,15 @@ namespace Xamarin.Forms var family = (string)values[0]; if (family != null) { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.OfSize(family, size).WithAttributes((FontAttributes)values[1]); +#pragma warning restore } else { +#pragma warning disable 0618 // retain until Font removed label.Font = Font.SystemFontOfSize(size, (FontAttributes)values[1]); +#pragma warning restore } label._cancelEvents = false; @@ -246,7 +258,9 @@ namespace Xamarin.Forms static void OnHorizontalTextAlignmentPropertyChanged(BindableObject bindable, object oldValue, object newValue) { var label = (Label)bindable; +#pragma warning disable 0618 // retain until XAlign removed label.OnPropertyChanged(nameof(XAlign)); +#pragma warning restore } static void OnTextPropertyChanged(BindableObject bindable, object oldvalue, object newvalue) @@ -264,7 +278,9 @@ namespace Xamarin.Forms static void OnVerticalTextAlignmentPropertyChanged(BindableObject bindable, object oldValue, object newValue) { var label = (Label)bindable; +#pragma warning disable 0618 // retain until YAlign removed label.OnPropertyChanged(nameof(YAlign)); +#pragma warning restore } } }
\ No newline at end of file |