diff options
| author | Seungkeun Lee <sngn.lee@samsung.com> | 2017-05-17 23:08:25 +0000 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.ap-northeast-2.compute.internal> | 2017-05-17 23:08:25 +0000 |
| commit | 8b016247b0b99a6b8adad819edf99538dd15c19c (patch) | |
| tree | 753c114fae82118a1f9c963ca02b2441de7c2e1e | |
| parent | cae6df7d4f2d40069ee490fb8ca2563a4600b79b (diff) | |
| parent | 3ad684d1a9d45dfd7ed6c892aefbf21e230f3ffe (diff) | |
| download | xamarin-forms-8b016247b0b99a6b8adad819edf99538dd15c19c.tar.gz xamarin-forms-8b016247b0b99a6b8adad819edf99538dd15c19c.tar.bz2 xamarin-forms-8b016247b0b99a6b8adad819edf99538dd15c19c.zip | |
Merge "fix default textcolor" into tizen
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs | 4 | ||||
| -rw-r--r-- | Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs | 11 |
2 files changed, 3 insertions, 12 deletions
diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs index 0f214636..ff96a677 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/EditorRenderer.cs @@ -5,8 +5,6 @@ namespace Xamarin.Forms.Platform.Tizen { public class EditorRenderer : ViewRenderer<Editor, Native.Entry> { - static readonly EColor s_defaultTextColor = EColor.Black; - public EditorRenderer() { RegisterPropertyHandler(Editor.TextProperty, UpdateText); @@ -61,7 +59,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } void UpdateFontSize() diff --git a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs index 7e7c8925..c880098a 100644 --- a/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs +++ b/Xamarin.Forms.Platform.Tizen/Renderers/EntryRenderer.cs @@ -1,17 +1,10 @@ using System; -using Xamarin.Forms.PlatformConfiguration.TizenSpecific; - -using EColor = ElmSharp.Color; using Specific = Xamarin.Forms.PlatformConfiguration.TizenSpecific.Entry; namespace Xamarin.Forms.Platform.Tizen { public class EntryRenderer : ViewRenderer<Entry, Native.Entry>, IDisposable { - static readonly EColor s_defaultTextColor = EColor.Black; - - static readonly EColor s_defaultPlaceholderColor = EColor.Gray; - public EntryRenderer() { RegisterPropertyHandler(Entry.IsPasswordProperty, UpdateIsPassword); @@ -90,7 +83,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdateTextColor() { - Control.TextColor = Element.TextColor.IsDefault ? s_defaultTextColor : Element.TextColor.ToNative(); + Control.TextColor = Element.TextColor.ToNative(); } void UpdateFontSize() @@ -125,7 +118,7 @@ namespace Xamarin.Forms.Platform.Tizen void UpdatePlaceholderColor() { - Control.PlaceholderColor = Element.PlaceholderColor.IsDefault ? s_defaultPlaceholderColor : Element.PlaceholderColor.ToNative(); + Control.PlaceholderColor = Element.PlaceholderColor.ToNative(); } void UpdateFontWeight() |