diff options
author | Seungkeun Lee <sngn.lee@samsung.com> | 2017-05-17 02:20:49 +0000 |
---|---|---|
committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-05-17 02:20:49 +0000 |
commit | 459fea7a6559a79a6bdf737a8af234e959b79a3f (patch) | |
tree | 630ee1ea9a247e0e2d8ced84e862e217e0ebea7b | |
parent | 48d0bba558270535f6c596f6067ffc936d5848c1 (diff) | |
parent | b28ff7ef42993351b99fac6e0d449f339e037067 (diff) | |
download | xamarin-forms-459fea7a6559a79a6bdf737a8af234e959b79a3f.tar.gz xamarin-forms-459fea7a6559a79a6bdf737a8af234e959b79a3f.tar.bz2 xamarin-forms-459fea7a6559a79a6bdf737a8af234e959b79a3f.zip |
Merge "Remove unneccesarry default color setting for PickerRenderer" into tizen
3 files changed, 3 insertions, 7 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs index aed7b9d6..f7aef30f 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/DatePickerRenderer.cs @@ -7,7 +7,6 @@ namespace Xamarin.Forms.Platform.Tizen { //TODO need to add internationalization support const string DialogTitle = "Choose Date"; - static readonly EColor s_defaultTextColor = EColor.White; public DatePickerRenderer() { @@ -70,7 +69,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } } diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs index 6080d647..663e56b1 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/PickerRenderer.cs @@ -8,7 +8,6 @@ namespace Xamarin.Forms.Platform.Tizen { public class PickerRenderer : ViewRenderer<Picker, Native.Button> { - static readonly EColor s_defaultTextColor = EColor.White; internal List _list; internal Native.Dialog _dialog; Dictionary<ListItem, int> _itemToItemNumber = new Dictionary<ListItem, int>(); @@ -62,7 +61,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } void OnClick(object sender, EventArgs e) diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs index 9f964c18..68e697ed 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/TimePickerRenderer.cs @@ -11,8 +11,6 @@ namespace Xamarin.Forms.Platform.Tizen static readonly string s_defaultFormat = CultureInfo.CurrentCulture.DateTimeFormat.ShortTimePattern; - static readonly EColor s_defaultTextColor = EColor.White; - string _format; TimeSpan _time; @@ -83,7 +81,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } void UpdateTime() |