From: xb.teng Date: Mon, 7 Aug 2017 20:57:16 +0000 (+0800) Subject: Update Placeholder property comments of TextField/TextEditor and sample X-Git-Tag: accepted/tizen/4.0/unified/20170828.223314~43^2~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=refs%2Fchanges%2F94%2F142894%2F1;p=platform%2Fcore%2Fcsapi%2Fnui.git Update Placeholder property comments of TextField/TextEditor and sample Change-Id: I0079801371b2375422bfa1b19ac78b87cf091c64 --- diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs index aa8bd54..fa509f3 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs @@ -83,6 +83,8 @@ namespace TextTest field.Position2D = new Position2D(10, 400); field.BackgroundColor = Color.Cyan; field.PlaceholderText = "input someth..."; + field.PlaceholderTextFocused = "input someth... focused"; + field.Focusable = true; PropertyMap hiddenMap = new PropertyMap(); hiddenMap.Add(HiddenInputProperty.Mode, new PropertyValue((int)HiddenInputModeType.ShowLastCharacter)); hiddenMap.Add(HiddenInputProperty.ShowDuration, new PropertyValue(2)); @@ -101,9 +103,10 @@ namespace TextTest field.InputMethodSettings = inputMethod.OutputMap; PropertyMap propertyMap = new PropertyMap(); - propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text")); + propertyMap.Add("placeholderText", new PropertyValue("Placeholder Text")); + propertyMap.Add("placeholderTextFocused", new PropertyValue("Placeholder Text Focused")); propertyMap.Add("placeholderColor", new PropertyValue(Color.Red)); - propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f)); + propertyMap.Add("placeholderPointSize", new PropertyValue(15.0f)); PropertyMap fontStyleMap = new PropertyMap(); fontStyleMap.Add("weight", new PropertyValue("bold")); @@ -119,7 +122,6 @@ namespace TextTest editor.EnableSelection = true; editor.Focusable = true; editor.Placeholder = propertyMap; - FocusManager.Instance.SetCurrentFocusView(editor); window.Add(editor); editor.TextChanged += (obj, e) => { Tizen.Log.Debug("NUI", "editor line count: " + e.TextEditor.LineCount); @@ -130,6 +132,10 @@ namespace TextTest }; Tizen.Log.Debug("NUI", "editor id: " + editor.ID); + + FocusManager.Instance.SetCurrentFocusView(editor); + editor.UpFocusableView = field; + field.DownFocusableView = editor; } [STAThread] diff --git a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 16d6dae..616cd7f 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -1222,6 +1222,7 @@ namespace Tizen.NUI.BaseComponents /// /// PropertyMap propertyMap = new PropertyMap(); /// propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text")); + /// propertyMap.Add("placeholderTextFocused", new PropertyValue("Setting Placeholder Text Focused")); /// propertyMap.Add("placeholderColor", new PropertyValue(Color.Red)); /// propertyMap.Add("placeholderFontFamily", new PropertyValue("Arial")); /// propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f)); diff --git a/Tizen.NUI/src/public/BaseComponents/TextField.cs b/Tizen.NUI/src/public/BaseComponents/TextField.cs index 2040b7b..6d0d4fa 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -1256,6 +1256,7 @@ namespace Tizen.NUI.BaseComponents /// /// PropertyMap propertyMap = new PropertyMap(); /// propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text")); + /// propertyMap.Add("placeholderTextFocused", new PropertyValue("Setting Placeholder Text Focused")); /// propertyMap.Add("placeholderColor", new PropertyValue(Color.Red)); /// propertyMap.Add("placeholderFontFamily", new PropertyValue("Arial")); /// propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f));