From 396fc9040a6dd3a510e8c88ff49e93e971a49edf Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Mon, 14 Aug 2017 16:43:19 +0900 Subject: [PATCH] Revert "[Tizen] Update Placeholder property of TextField/TextEditor and its sample" This reverts commit 05e23eff33395ae88a868bad5f5178fcedb38740. Change-Id: If9235ccd5bdddbc9abffc72dbbef68e19932acd9 --- NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs | 7 ------- src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs | 1 - src/Tizen.NUI/src/public/BaseComponents/TextField.cs | 1 - 3 files changed, 9 deletions(-) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs index dc82769..aa8bd54 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/text-test.cs @@ -83,8 +83,6 @@ 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)); @@ -104,7 +102,6 @@ namespace TextTest PropertyMap propertyMap = new PropertyMap(); propertyMap.Add("placeholderText", new PropertyValue("Setting Placeholder Text")); - propertyMap.Add("placeholderTextFocused", new PropertyValue("Placeholder Text Focused")); propertyMap.Add("placeholderColor", new PropertyValue(Color.Red)); propertyMap.Add("placeholderPointSize", new PropertyValue(12.0f)); @@ -133,10 +130,6 @@ namespace TextTest }; Tizen.Log.Debug("NUI", "editor id: " + editor.ID); - - FocusManager.Instance.SetCurrentFocusView(editor); - editor.UpFocusableView = field; - field.DownFocusableView = editor; } [STAThread] diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 5ccab67..6d1aea5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -1298,7 +1298,6 @@ 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/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index ba7d45c..21fabfe 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -1325,7 +1325,6 @@ 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)); -- 2.7.4