From 8386a33a385147310cce0283309bce714ada7658 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Wed, 4 Oct 2017 13:39:15 +0100 Subject: [PATCH] (TextField) Rename ShowDuration to ShowLastCharacterDuration Conflicts: Tizen.NUI/src/public/NUIConstants.cs Change-Id: Ia9ff405942757452de973da4106b1a6eda4af6af --- NUISamples/examples/text-test.cs | 2 +- Tizen.NUI/src/internal/ManualPINVOKE.cs | 5 +++-- Tizen.NUI/src/public/NUIConstants.cs | 4 ++-- 3 files changed, 6 insertions(+), 5 deletions(-) diff --git a/NUISamples/examples/text-test.cs b/NUISamples/examples/text-test.cs index d8a7445..10a1552 100755 --- a/NUISamples/examples/text-test.cs +++ b/NUISamples/examples/text-test.cs @@ -116,7 +116,7 @@ namespace TextTest field.Focusable = true; PropertyMap hiddenMap = new PropertyMap(); hiddenMap.Add(HiddenInputProperty.Mode, new PropertyValue((int)HiddenInputModeType.ShowLastCharacter)); - hiddenMap.Add(HiddenInputProperty.ShowDuration, new PropertyValue(2)); + hiddenMap.Add(HiddenInputProperty.ShowLastCharacterDuration, new PropertyValue(2)); hiddenMap.Add(HiddenInputProperty.SubstituteCount, new PropertyValue(4)); hiddenMap.Add(HiddenInputProperty.SubstituteCharacter, new PropertyValue(0x23)); field.HiddenInputSettings = hiddenMap; diff --git a/Tizen.NUI/src/internal/ManualPINVOKE.cs b/Tizen.NUI/src/internal/ManualPINVOKE.cs index dbdf015..28d7154 100755 --- a/Tizen.NUI/src/internal/ManualPINVOKE.cs +++ b/Tizen.NUI/src/internal/ManualPINVOKE.cs @@ -677,8 +677,9 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_HIDDENINPUT_PROPERTY_SUBSTITUTE_COUNT_get")] public static extern int HIDDENINPUT_PROPERTY_SUBSTITUTE_COUNT_get(); - [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_HIDDENINPUT_PROPERTY_SHOW_DURATION_get")] - public static extern int HIDDENINPUT_PROPERTY_SHOW_DURATION_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint = "CSharp_HIDDENINPUT_PROPERTY_SHOW_LAST_CHARACTER_DURATION_get")] + public static extern int HIDDENINPUT_PROPERTY_SHOW_LAST_CHARACTER_DURATION_get(); + [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_TtsPlayer_SWIGUpcast")] public static extern global::System.IntPtr TtsPlayer_SWIGUpcast(global::System.IntPtr jarg1); diff --git a/Tizen.NUI/src/public/NUIConstants.cs b/Tizen.NUI/src/public/NUIConstants.cs index f1506a8..8ef8163 100755 --- a/Tizen.NUI/src/public/NUIConstants.cs +++ b/Tizen.NUI/src/public/NUIConstants.cs @@ -997,7 +997,7 @@ namespace Tizen.NUI public static readonly int Mode = NDalicManualPINVOKE.HIDDENINPUT_PROPERTY_MODE_get(); public static readonly int SubstituteCharacter = NDalicManualPINVOKE.HIDDENINPUT_PROPERTY_SUBSTITUTE_CHARACTER_get(); public static readonly int SubstituteCount = NDalicManualPINVOKE.HIDDENINPUT_PROPERTY_SUBSTITUTE_COUNT_get(); - public static readonly int ShowDuration = NDalicManualPINVOKE.HIDDENINPUT_PROPERTY_SHOW_DURATION_get(); + public static readonly int ShowLastCharacterDuration = NDalicManualPINVOKE.HIDDENINPUT_PROPERTY_SHOW_LAST_CHARACTER_DURATION_get(); } /// @@ -1022,7 +1022,7 @@ namespace Tizen.NUI /// ShowCount, /// - /// Show last character for the duration (use ShowDuration property to modify duration). + /// Show last character for the duration(use ShowLastCharacterDuration property to modify duration). /// ShowLastCharacter } -- 2.7.4