From 8b9756de39db8f760e8d7055882398c16d27dc60 Mon Sep 17 00:00:00 2001
From: zhouleonlei <56956725+zhouleonlei@users.noreply.github.com>
Date: Wed, 29 Jul 2020 18:21:36 +0800
Subject: [PATCH] [NUI] Fix the type convert issue when new InputField (#1874)
---
.../public/BaseComponents/TextFieldSelectorData.cs | 24 +++++++++++++++++++---
1 file changed, 21 insertions(+), 3 deletions(-)
mode change 100644 => 100755 src/Tizen.NUI/src/public/BaseComponents/TextFieldSelectorData.cs
diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextFieldSelectorData.cs b/src/Tizen.NUI/src/public/BaseComponents/TextFieldSelectorData.cs
old mode 100644
new mode 100755
index 797284d..7488882
--- a/src/Tizen.NUI/src/public/BaseComponents/TextFieldSelectorData.cs
+++ b/src/Tizen.NUI/src/public/BaseComponents/TextFieldSelectorData.cs
@@ -20,8 +20,13 @@ namespace Tizen.NUI.BaseComponents
///
/// The class storing extra data for a TextField to optimize size of it.
///
- internal class TextFieldSelectorData : TextLabelSelectorData
+ internal class TextFieldSelectorData
{
+ public TriggerableSelector TranslatableText { get; } = new TriggerableSelector(TextField.TranslatableTextProperty);
+ public TriggerableSelector Text { get; } = new TriggerableSelector(TextField.TextProperty);
+ public TriggerableSelector FontFamily { get; } = new TriggerableSelector(TextField.FontFamilyProperty);
+ public TriggerableSelector TextColor { get; } = new TriggerableSelector(TextField.TextColorProperty, GetTextColor);
+ public TriggerableSelector PointSize { get; } = new TriggerableSelector(TextField.PointSizeProperty);
public TriggerableSelector TranslatablePlaceholderText { get; } = new TriggerableSelector(TextField.TranslatablePlaceholderTextProperty);
public TriggerableSelector PlaceholderTextColor { get; } = new TriggerableSelector(TextField.PlaceholderTextColorProperty, delegate (View view)
{
@@ -43,13 +48,26 @@ namespace Tizen.NUI.BaseComponents
return null;
});
- public override void Reset(View view)
+ public void Reset(View view)
{
+ TranslatableText.Reset(view);
+ Text.Reset(view);
+ FontFamily.Reset(view);
+ TextColor.Reset(view);
+ PointSize.Reset(view);
TranslatablePlaceholderText.Reset(view);
PlaceholderTextColor.Reset(view);
PrimaryCursorColor.Reset(view);
+ }
- base.Reset(view);
+ private static Color GetTextColor(View view)
+ {
+ Color color = new Color();
+ if (view.GetProperty(TextField.Property.TEXT_COLOR).Get(color))
+ {
+ return color;
+ }
+ return null;
}
}
}
--
2.7.4