From b2d5c482d40964f8f1c5ef833f1b7c0b01bb26cc Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Sun, 9 Oct 2022 20:12:10 +0900 Subject: [PATCH] [NUI] Change property get/set not to use PropertyValue (patch set3) --- src/Tizen.NUI/Tizen.NUI.csproj | 100 +++-- .../src/public/BaseComponents/ImageView.cs | 33 ++ .../BaseComponents/ImageViewBindableProperty.cs | 43 +- .../src/public/BaseComponents/TextEditor.cs | 21 + .../BaseComponents/TextEditorBindableProperty.cs | 446 ++++++++++++++++++++- .../src/public/BaseComponents/TextField.cs | 21 + .../BaseComponents/TextFieldBindableProperty.cs | 382 +++++++++++++++++- .../src/public/BaseComponents/TextLabel.cs | 32 ++ .../BaseComponents/TextLabelBindableProperty.cs | 227 ++++++++++- src/Tizen.NUI/src/public/Window/Window.cs | 13 +- 10 files changed, 1245 insertions(+), 73 deletions(-) diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index 060846c..748311a 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -1,57 +1,51 @@  - - - netstandard2.0 - $(NoWarn);CS0618;CS0809;CS1591;CA1054;CA1056 - 8.0 - - - - NUI_DEBUG_OFF;NUI_PROPERTY_CHANGE_1; - - - - - - - - - - - - - - - - - - - - - - - + + netstandard2.0 + $(NoWarn);CS0618;CS0809;CS1591;CA1054;CA1056 + 8.0 + + + NUI_DEBUG_OFF;NUI_PROPERTY_CHANGE_1;NUI_PROPERTY_CHANGE_2; + - - TizenSystemSettings - - - TizenSystemInformation - + - - - - - PreserveNewest - - - - - - - - + + + + + + + + + + + + + + + + + + TizenSystemSettings + + + TizenSystemInformation + + + + + + PreserveNewest + + + diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index 27c15b1..1488f7e 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -66,6 +66,18 @@ namespace Tizen.NUI.BaseComponents private TriggerableSelector resourceUrlSelector; private TriggerableSelector borderSelector; +#if NUI_PROPERTY_CHANGE_2 + private RelativeVector4 internalPixelArea; +#endif + +#if NUI_PROPERTY_CHANGE_DEBUG + internal static int PreMultipliedAlphaGetter = 0; + internal static int PreMultipliedAlphaSetter = 0; + internal static int PixelAreaGetter = 0; + internal static int PixelAreaSetter = 0; +#endif + + /// /// Creates an initialized ImageView. /// @@ -389,10 +401,16 @@ namespace Tizen.NUI.BaseComponents { get { +#if NUI_PROPERTY_CHANGE_DEBUG +PreMultipliedAlphaGetter++; +#endif return (bool)GetValue(PreMultipliedAlphaProperty); } set { +#if NUI_PROPERTY_CHANGE_DEBUG +PreMultipliedAlphaSetter++; +#endif SetValue(PreMultipliedAlphaProperty, value); NotifyPropertyChanged(); } @@ -410,11 +428,22 @@ namespace Tizen.NUI.BaseComponents { get { +#if NUI_PROPERTY_CHANGE_DEBUG +PixelAreaGetter++; +#endif + +#if NUI_PROPERTY_CHANGE_2 + return (RelativeVector4)GetValue(PixelAreaProperty); +#else RelativeVector4 temp = (RelativeVector4)GetValue(PixelAreaProperty); return new RelativeVector4(OnPixelAreaChanged, temp.X, temp.Y, temp.Z, temp.W); +#endif } set { +#if NUI_PROPERTY_CHANGE_DEBUG +PixelAreaSetter++; +#endif SetValue(PixelAreaProperty, value); NotifyPropertyChanged(); } @@ -1251,6 +1280,10 @@ namespace Tizen.NUI.BaseComponents return; } +#if NUI_PROPERTY_CHANGE_2 + internalPixelArea?.Dispose(); +#endif + if (type == DisposeTypes.Explicit) { //Called by User diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs index 3dc1024..2abadb3 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageViewBindableProperty.cs @@ -116,7 +116,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.Object.GetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.IMAGE).Get(returnValue); // Update cached property map - if(returnValue != null) + if (returnValue != null) { imageView.MergeCachedImageVisualProperty(returnValue); } @@ -135,7 +135,7 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { - if(imageView.imagePropertyUpdatedFlag) + if (imageView.imagePropertyUpdatedFlag) { // If imageView Property still not send to the dali, Append cached property. imageView.UpdateImage(Visual.Property.PremultipliedAlpha, new PropertyValue((bool)newValue)); @@ -143,7 +143,11 @@ namespace Tizen.NUI.BaseComponents else { // Else, we don't need to re-create view. Get value from current ImageView. +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } } }), @@ -152,7 +156,7 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; bool temp = false; - if(imageView.imagePropertyUpdatedFlag) + if (imageView.imagePropertyUpdatedFlag) { // If imageView Property still not send to the dali, just get cached property. imageView.GetCachedImageVisualProperty(Visual.Property.PremultipliedAlpha)?.Get(out temp); @@ -160,7 +164,11 @@ namespace Tizen.NUI.BaseComponents else { // Else, PremultipliedAlpha may not setuped in cached property. Get value from current ImageView. +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyBool(imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha); +#else Tizen.NUI.Object.GetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PreMultipliedAlpha).Get(out temp); +#endif } return temp; })); @@ -172,16 +180,29 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(imageView.SwigCPtr, ImageView.Property.PixelArea, ((RelativeVector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PixelArea, new Tizen.NUI.PropertyValue((RelativeVector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var imageView = (ImageView)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (imageView.internalPixelArea == null) + { + imageView.internalPixelArea = new RelativeVector4(imageView.OnPixelAreaChanged, 0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(imageView.SwigCPtr, ImageView.Property.PixelArea, imageView.internalPixelArea.SwigCPtr); + return imageView.internalPixelArea; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((HandleRef)imageView.SwigCPtr, ImageView.Property.PixelArea).Get(temp); RelativeVector4 relativeTemp = new RelativeVector4(temp.X, temp.Y, temp.Z, temp.W); return relativeTemp; +#endif })); /// Intenal used, will never be opened. @@ -214,11 +235,11 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { - if(oldValue != null) + if (oldValue != null) { bool oldBool = (bool)oldValue; bool newBool = (bool)newValue; - if(oldBool == newBool) + if (oldBool == newBool) { return; } @@ -243,11 +264,11 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { - if(oldValue != null) + if (oldValue != null) { bool oldBool = (bool)oldValue; bool newBool = (bool)newValue; - if(oldBool == newBool) + if (oldBool == newBool) { return; } @@ -272,11 +293,11 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { - if(oldValue != null) + if (oldValue != null) { bool oldBool = (bool)oldValue; bool newBool = (bool)newValue; - if(oldBool == newBool) + if (oldBool == newBool) { return; } @@ -301,11 +322,11 @@ namespace Tizen.NUI.BaseComponents var imageView = (ImageView)bindable; if (newValue != null) { - if(oldValue != null) + if (oldValue != null) { bool oldBool = (bool)oldValue; bool newBool = (bool)newValue; - if(oldBool == newBool) + if (oldBool == newBool) { return; } diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 407ba48..679dab4 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -40,6 +40,17 @@ namespace Tizen.NUI.BaseComponents private bool hasFontSizeChangedCallback = false; private bool isSettingTextInCSharp = false; +#if NUI_PROPERTY_CHANGE_2 + private Vector4 internalPlaceholderTextColor = null; + private Vector4 internalPrimaryCursorColor = null; + private Vector4 internalSecondaryCursorColor = null; + private Vector4 internalSelectionHighlightColor = null; + private Vector4 internalInputColor = null; + private Color internalTextColor = null; + private Color internalGrabHandleColor = null; + +#endif + static TextEditor() { } /// @@ -2410,6 +2421,16 @@ namespace Tizen.NUI.BaseComponents return; } +#if NUI_PROPERTY_CHANGE_2 + internalPlaceholderTextColor?.Dispose(); + internalPrimaryCursorColor?.Dispose(); + internalSecondaryCursorColor?.Dispose(); + internalSelectionHighlightColor?.Dispose(); + internalInputColor?.Dispose(); + internalTextColor?.Dispose(); + internalGrabHandleColor?.Dispose(); +#endif + if (systemlangTextFlag) { SystemSettings.LocaleLanguageChanged -= SystemSettings_LocaleLanguageChanged; diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs index 482c060..dd692bd 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditorBindableProperty.cs @@ -34,16 +34,24 @@ namespace Tizen.NUI.BaseComponents if (newValue != null) { textEditor.isSettingTextInCSharp = true; +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.TEXT, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TEXT, new Tizen.NUI.PropertyValue((string)newValue)); +#endif textEditor.isSettingTextInCSharp = false; } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.TEXT); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TEXT).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -52,15 +60,29 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.TextColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TextColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalTextColor == null) + { + textEditor.internalTextColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.TextColor, textEditor.internalTextColor.SwigCPtr); + return textEditor.internalTextColor; +#else + Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.TextColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -69,15 +91,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.FontFamily, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontFamily, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.FontFamily); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontFamily).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -103,15 +133,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PointSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PointSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PointSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PointSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -120,18 +158,25 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.HorizontalAlignment).Get(out temp) == false) { NUILog.Error("HorizontalAlignment get error!"); } - +#endif return temp.GetValueByDescription(); })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -140,18 +185,25 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.VerticalAlignment).Get(out temp) == false) { NUILog.Error("VerticalAlignment get error!"); } - +#endif return temp.GetValueByDescription(); })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -161,15 +213,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollThreshold).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -178,15 +238,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollSpeed).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -195,15 +263,28 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalPrimaryCursorColor == null) + { + textEditor.internalPrimaryCursorColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor, textEditor.internalPrimaryCursorColor.SwigCPtr); + return textEditor.internalPrimaryCursorColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PrimaryCursorColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -212,15 +293,28 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalSecondaryCursorColor == null) + { + textEditor.internalSecondaryCursorColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor, textEditor.internalSecondaryCursorColor.SwigCPtr); + return textEditor.internalSecondaryCursorColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SecondaryCursorColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -229,15 +323,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableCursorBlink).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -246,15 +348,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkInterval).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -263,15 +373,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorBlinkDuration).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -280,15 +398,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.CursorWidth, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorWidth, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.CursorWidth); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CursorWidth).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -297,15 +423,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleImage).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -314,15 +448,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandlePressedImage).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -451,15 +593,28 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalSelectionHighlightColor == null) + { + textEditor.internalSelectionHighlightColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor, textEditor.internalSelectionHighlightColor.SwigCPtr); + return textEditor.internalSelectionHighlightColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SelectionHighlightColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -485,15 +640,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableMarkup, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableMarkup, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableMarkup); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableMarkup).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -502,15 +665,28 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.InputColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalInputColor == null) + { + textEditor.internalInputColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.InputColor, textEditor.internalInputColor.SwigCPtr); + return textEditor.internalInputColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -519,15 +695,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputFontFamily, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputFontFamily, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputFontFamily); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputFontFamily).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -553,15 +737,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputPointSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputPointSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputPointSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputPointSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -570,15 +762,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.LineSpacing, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineSpacing, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.LineSpacing); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineSpacing).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -587,15 +787,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputLineSpacing).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty RelativeLineHeightProperty = BindableProperty.Create(nameof(RelativeLineHeight), typeof(float), typeof(TextEditor), default(float), propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => @@ -603,15 +811,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.RelativeLineHeight).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -637,15 +853,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputUnderline, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputUnderline, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputUnderline); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputUnderline).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -672,15 +896,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputShadow, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputShadow, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputShadow); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputShadow).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -689,15 +921,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.EMBOSS, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EMBOSS, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.EMBOSS); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EMBOSS).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -706,15 +946,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputEmboss, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputEmboss, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputEmboss); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputEmboss).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -740,15 +988,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputOutline, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputOutline, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.InputOutline); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.InputOutline).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -757,15 +1013,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.SmoothScroll, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScroll, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.SmoothScroll); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScroll).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -774,15 +1038,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.SmoothScrollDuration).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -791,15 +1063,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableScrollBar).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -808,15 +1088,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarShowDuration).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -825,15 +1113,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ScrollBarFadeDuration).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -842,15 +1138,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PixelSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PixelSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.PixelSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PixelSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -859,15 +1163,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textEditor.SwigCPtr, TextEditor.Property.PlaceholderText, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderText, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textEditor.SwigCPtr, TextEditor.Property.PlaceholderText); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderText).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -876,15 +1188,28 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor, ((Color)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor, new Tizen.NUI.PropertyValue((Color)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalPlaceholderTextColor == null) + { + textEditor.internalPlaceholderTextColor = new Color(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor, textEditor.internalPlaceholderTextColor.SwigCPtr); + return textEditor.internalPlaceholderTextColor; +#else Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.PlaceholderTextColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -893,15 +1218,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableSelection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableSelection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableSelection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableSelection).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -927,18 +1260,26 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.LineWrapMode, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineWrapMode, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.LineWrapMode); +#else int temp; if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.LineWrapMode).Get(out temp) == false) { NUILog.Error("LineWrapMode get error!"); } return (LineWrapMode)temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -947,16 +1288,24 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; //textEditor.mShiftSelectionFlag(true); +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableShiftSelection).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -965,15 +1314,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MatchSystemLanguageDirection).Get(out temp); return (bool)temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -982,15 +1339,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.MaxLength, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MaxLength, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.MaxLength); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MaxLength).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -999,18 +1364,26 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.FontSizeScale, (float)newValue); +#else using (var property = new Tizen.NUI.PropertyValue((float)newValue)) { Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontSizeScale, property); } +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.FontSizeScale); +#else float temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.FontSizeScale).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -1019,18 +1392,26 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale, (bool)newValue); +#else using (var property = new Tizen.NUI.PropertyValue((bool)newValue)) { Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale, property); } +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale); +#else bool temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableFontSizeScale).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -1040,15 +1421,28 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor, ((Color)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor, new Tizen.NUI.PropertyValue((Color)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textEditor.internalGrabHandleColor == null) + { + textEditor.internalGrabHandleColor = new Color(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor, textEditor.internalGrabHandleColor.SwigCPtr); + return textEditor.internalGrabHandleColor; +#else Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.GrabHandleColor).Get(temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -1057,15 +1451,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandle).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -1074,15 +1476,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EnableGrabHandlePopup).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -1108,15 +1518,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.ELLIPSIS).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -1125,15 +1543,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.EllipsisPosition).Get(out temp); return (EllipsisPosition)temp; +#endif })); /// currently need to be hidden as inhouse API. @@ -1143,15 +1569,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.MinLineSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MinLineSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.MinLineSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.MinLineSize).Get(out temp); return temp; +#endif })); /// @@ -1269,15 +1703,23 @@ namespace Tizen.NUI.BaseComponents var textEditor = (TextEditor)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textEditor = (TextEditor)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing); +#else float temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textEditor.SwigCPtr, TextEditor.Property.CharacterSpacing).Get(out temp); return temp; +#endif })); } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index 712d65d..ddcb809 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -40,6 +40,17 @@ namespace Tizen.NUI.BaseComponents private bool hasFontSizeChangedCallback = false; private bool isSettingTextInCSharp = false; +#if NUI_PROPERTY_CHANGE_2 + private Vector4 internalPlaceholderTextColor = null; + private Vector4 internalPrimaryCursorColor = null; + private Vector4 internalSecondaryCursorColor = null; + private Vector4 internalSelectionHighlightColor = null; + private Vector4 internalInputColor = null; + private Color internalTextColor = null; + private Color internalGrabHandleColor = null; + +#endif + static TextField() { } /// @@ -2409,6 +2420,16 @@ namespace Tizen.NUI.BaseComponents return; } +#if NUI_PROPERTY_CHANGE_2 + internalPlaceholderTextColor?.Dispose(); + internalPrimaryCursorColor?.Dispose(); + internalSecondaryCursorColor?.Dispose(); + internalSelectionHighlightColor?.Dispose(); + internalInputColor?.Dispose(); + internalTextColor?.Dispose(); + internalGrabHandleColor?.Dispose(); +#endif + if (systemlangTextFlag) { SystemSettings.LocaleLanguageChanged -= SystemSettings_LocaleLanguageChanged; diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs index 3d56dc1..e0e5ac5 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextFieldBindableProperty.cs @@ -85,16 +85,24 @@ namespace Tizen.NUI.BaseComponents if (newValue != null) { textField.isSettingTextInCSharp = true; +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.TEXT, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TEXT, new Tizen.NUI.PropertyValue((string)newValue)); +#endif textField.isSettingTextInCSharp = false; } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.TEXT); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TEXT).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -103,15 +111,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderText, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderText, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderText); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderText).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -120,15 +136,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderTextFocused, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextFocused, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.PlaceholderTextFocused); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextFocused).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -137,15 +161,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.FontFamily, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontFamily, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.FontFamily); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontFamily).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -172,15 +204,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.PointSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PointSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.PointSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PointSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -189,15 +229,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.MaxLength, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MaxLength, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.MaxLength); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MaxLength).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -206,15 +254,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.ExceedPolicy, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ExceedPolicy, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.ExceedPolicy); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ExceedPolicy).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -223,18 +279,25 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.HorizontalAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.HorizontalAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.HorizontalAlignment); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.HorizontalAlignment).Get(out temp) == false) { NUILog.Error("HorizontalAlignment get error!"); } - +#endif return temp.GetValueByDescription(); })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -244,18 +307,25 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.VerticalAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.VerticalAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.VerticalAlignment); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.VerticalAlignment).Get(out temp) == false) { NUILog.Error("VerticalAlignment get error!"); } - +#endif return temp.GetValueByDescription(); })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -265,15 +335,29 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.TextColor, ((Color)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TextColor, new Tizen.NUI.PropertyValue((Color)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalTextColor == null) + { + textField.internalTextColor = new Color(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.TextColor, textField.internalTextColor.SwigCPtr); + return textField.internalTextColor; + +#else Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.TextColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -282,15 +366,28 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.PlaceholderTextColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalPlaceholderTextColor == null) + { + textField.internalPlaceholderTextColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.PlaceholderTextColor, textField.internalPlaceholderTextColor.SwigCPtr); + return textField.internalPlaceholderTextColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PlaceholderTextColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -299,15 +396,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandle, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandle, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandle); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandle).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -316,15 +421,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableGrabHandlePopup).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -333,15 +446,28 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.PrimaryCursorColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PrimaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalPrimaryCursorColor == null) + { + textField.internalPrimaryCursorColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.PrimaryCursorColor, textField.internalPrimaryCursorColor.SwigCPtr); + return textField.internalPrimaryCursorColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PrimaryCursorColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -350,15 +476,28 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.SecondaryCursorColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SecondaryCursorColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalSecondaryCursorColor == null) + { + textField.internalSecondaryCursorColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.SecondaryCursorColor, textField.internalSecondaryCursorColor.SwigCPtr); + return textField.internalSecondaryCursorColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SecondaryCursorColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -367,15 +506,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableCursorBlink, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableCursorBlink, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableCursorBlink); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableCursorBlink).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -384,15 +531,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkInterval, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkInterval, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkInterval); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkInterval).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -401,15 +556,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkDuration, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkDuration, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.CursorBlinkDuration); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorBlinkDuration).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -418,15 +581,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.CursorWidth, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorWidth, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.CursorWidth); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CursorWidth).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -435,15 +606,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandleImage, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleImage, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandleImage); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleImage).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -452,15 +631,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandlePressedImage, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandlePressedImage, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.GrabHandlePressedImage); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandlePressedImage).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -469,15 +656,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollThreshold, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollThreshold, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollThreshold); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollThreshold).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -486,15 +681,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollSpeed, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollSpeed, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.ScrollSpeed); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ScrollSpeed).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -623,15 +826,28 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.SelectionHighlightColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SelectionHighlightColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalSelectionHighlightColor == null) + { + textField.internalSelectionHighlightColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.SelectionHighlightColor, textField.internalSelectionHighlightColor.SwigCPtr); + return textField.internalSelectionHighlightColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.SelectionHighlightColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -674,15 +890,28 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.InputColor, ((Vector4)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputColor, new Tizen.NUI.PropertyValue((Vector4)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalInputColor == null) + { + textField.internalInputColor = new Vector4(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.InputColor, textField.internalInputColor.SwigCPtr); + return textField.internalInputColor; +#else Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -691,15 +920,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableMarkup, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableMarkup, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableMarkup); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableMarkup).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -708,15 +945,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputFontFamily, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputFontFamily, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputFontFamily); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputFontFamily).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -742,15 +987,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.InputPointSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputPointSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.InputPointSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputPointSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -776,15 +1029,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputUnderline, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputUnderline, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputUnderline); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputUnderline).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -811,15 +1072,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputShadow, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputShadow, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputShadow); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputShadow).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -828,15 +1097,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.EMBOSS, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EMBOSS, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.EMBOSS); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EMBOSS).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -845,15 +1122,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputEmboss, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputEmboss, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputEmboss); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputEmboss).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -879,15 +1164,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textField.SwigCPtr, TextField.Property.InputOutline, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputOutline, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textField.SwigCPtr, TextField.Property.InputOutline); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.InputOutline).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -913,15 +1206,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.PixelSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PixelSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.PixelSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.PixelSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -930,15 +1231,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableSelection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableSelection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableSelection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableSelection).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -964,15 +1273,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.ELLIPSIS, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ELLIPSIS, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.ELLIPSIS); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.ELLIPSIS).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -981,15 +1298,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textField.SwigCPtr, TextField.Property.EllipsisPosition, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textField.SwigCPtr, TextField.Property.EllipsisPosition); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EllipsisPosition).Get(out temp); return (EllipsisPosition)temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -998,15 +1323,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableShiftSelection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableShiftSelection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableShiftSelection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableShiftSelection).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -1015,15 +1348,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.MatchSystemLanguageDirection).Get(out temp); return (bool)temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -1032,18 +1373,26 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.FontSizeScale, (float)newValue); +#else using (var property = new Tizen.NUI.PropertyValue((float)newValue)) { Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontSizeScale, property); } +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.FontSizeScale); +#else float temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.FontSizeScale).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -1052,18 +1401,26 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textField.SwigCPtr, TextField.Property.EnableFontSizeScale, (bool)newValue); +#else using (var property = new Tizen.NUI.PropertyValue((bool)newValue)) { Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableFontSizeScale, property); } +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textField.SwigCPtr, TextField.Property.EnableFontSizeScale); +#else bool temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.EnableFontSizeScale).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -1073,15 +1430,28 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(textField.SwigCPtr, TextField.Property.GrabHandleColor, ((Color)newValue).SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleColor, new Tizen.NUI.PropertyValue((Color)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textField.internalGrabHandleColor == null) + { + textField.internalGrabHandleColor = new Color(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textField.SwigCPtr, TextField.Property.GrabHandleColor, textField.internalGrabHandleColor.SwigCPtr); + return textField.internalGrabHandleColor; +#else Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.GrabHandleColor).Get(temp); return temp; +#endif })); /// @@ -1162,15 +1532,23 @@ namespace Tizen.NUI.BaseComponents var textField = (TextField)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textField.SwigCPtr, TextField.Property.CharacterSpacing, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CharacterSpacing, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textField = (TextField)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textField.SwigCPtr, TextField.Property.CharacterSpacing); +#else float temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textField.SwigCPtr, TextField.Property.CharacterSpacing).Get(out temp); return temp; +#endif })); } } diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 6a3a040..a0a5f6f 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -87,6 +87,19 @@ namespace Tizen.NUI.BaseComponents private float fontSizeScale = 1.0f; private bool hasFontSizeChangedCallback = false; +#if NUI_PROPERTY_CHANGE_2 + private Color internalTextColor; +#endif + +#if NUI_PROPERTY_CHANGE_DEBUG +internal static int TextGetter = 0; +internal static int TextSetter = 0; +internal static int FontFamilyGetter = 0; +internal static int FontFamilySetter = 0; +internal static int PointSizeGetter = 0; +#endif + + /// /// Creates the TextLabel control. /// @@ -223,10 +236,16 @@ namespace Tizen.NUI.BaseComponents { get { +#if NUI_PROPERTY_CHANGE_DEBUG +TextGetter++; +#endif return (string)GetValue(TextProperty); } set { +#if NUI_PROPERTY_CHANGE_DEBUG +TextSetter++; +#endif SetValue(TextProperty, value); NotifyPropertyChanged(); } @@ -241,10 +260,16 @@ namespace Tizen.NUI.BaseComponents { get { +#if NUI_PROPERTY_CHANGE_DEBUG +FontFamilyGetter++; +#endif return (string)GetValue(FontFamilyProperty); } set { +#if NUI_PROPERTY_CHANGE_DEBUG +FontFamilySetter++; +#endif SetValue(FontFamilyProperty, value); NotifyPropertyChanged(); } @@ -329,6 +354,9 @@ namespace Tizen.NUI.BaseComponents { get { +#if NUI_PROPERTY_CHANGE_DEBUG +PointSizeGetter++; +#endif return (float)GetValue(PointSizeProperty); } set @@ -1484,6 +1512,10 @@ namespace Tizen.NUI.BaseComponents return; } +#if NUI_PROPERTY_CHANGE_2 + internalTextColor?.Dispose(); +#endif + if (systemlangTextFlag) { SystemSettings.LocaleLanguageChanged -= SystemSettings_LocaleLanguageChanged; diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs index 5ec42c5..81d7261 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabelBindableProperty.cs @@ -70,9 +70,13 @@ namespace Tizen.NUI.BaseComponents defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.TEXT); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.TEXT).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -93,9 +97,13 @@ namespace Tizen.NUI.BaseComponents defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.FontFamily); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.FontFamily).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -134,9 +142,13 @@ namespace Tizen.NUI.BaseComponents defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.PointSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.PointSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -145,16 +157,24 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MultiLine, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MultiLine, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif textLabel.RequestLayout(); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MultiLine); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MultiLine).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -163,18 +183,25 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.HorizontalAlignment).Get(out temp) == false) { NUILog.Error("HorizontalAlignment get error!"); } - +#endif if (System.String.IsNullOrEmpty(temp)) { return HorizontalAlignment.Begin; // Return default value. @@ -200,18 +227,25 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalAlignment).Get(out temp) == false) { NUILog.Error("VerticalAlignment get error!"); } - +#endif if (System.String.IsNullOrEmpty(temp)) { return VerticalAlignment.Top; // Return default value. @@ -249,9 +283,18 @@ namespace Tizen.NUI.BaseComponents defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + if (textLabel.internalTextColor == null) + { + textLabel.internalTextColor = new Color(0, 0, 0, 0); + } + Interop.Actor.InternalRetrievingPropertyVector4(textLabel.SwigCPtr, TextLabel.Property.TextColor, textLabel.internalTextColor.SwigCPtr); + return textLabel.internalTextColor; +#else Color temp = new Color(0.0f, 0.0f, 0.0f, 0.0f); Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.TextColor).Get(temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -261,15 +304,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableMarkup, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableMarkup, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableMarkup); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableMarkup).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -278,15 +329,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableAutoScroll).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -295,15 +354,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollSpeed).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -312,15 +379,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopCount).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -329,15 +404,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollGap).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -346,16 +429,24 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.LineSpacing, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineSpacing, new Tizen.NUI.PropertyValue((float)newValue)); +#endif textLabel.RequestLayout(); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.LineSpacing); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineSpacing).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] public static readonly BindableProperty RelativeLineHeightProperty = BindableProperty.Create(nameof(RelativeLineHeight), typeof(float), typeof(TextLabel), default(float), propertyChanged: (BindableProperty.BindingPropertyChangedDelegate)((bindable, oldValue, newValue) => @@ -363,15 +454,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.RelativeLineHeight).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -438,15 +537,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(textLabel.SwigCPtr, TextLabel.Property.EMBOSS, (string)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EMBOSS, new Tizen.NUI.PropertyValue((string)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.EMBOSS); +#else string temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EMBOSS).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -484,9 +591,13 @@ namespace Tizen.NUI.BaseComponents defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.PixelSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.PixelSize).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -495,15 +606,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.ELLIPSIS).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -512,15 +631,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return (EllipsisPosition)Interop.Actor.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EllipsisPosition).Get(out temp); return (EllipsisPosition)temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -529,15 +656,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollLoopDelay).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -546,17 +681,25 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; string temp; +#if NUI_PROPERTY_CHANGE_2 + temp = Interop.Actor.InternalGetPropertyString(textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode); +#else if (Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.AutoScrollStopMode).Get(out temp) == false) { NUILog.Error("AutoScrollStopMode get error!"); } +#endif return temp.GetValueByDescription(); })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -566,18 +709,26 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.LineWrapMode, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineWrapMode, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return (LineWrapMode)Interop.Actor.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.LineWrapMode); +#else int temp; if (false == Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.LineWrapMode).Get(out temp)) { NUILog.Error("LineWrapMode get error!"); } return (LineWrapMode)temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -586,15 +737,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment, (int)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment, new Tizen.NUI.PropertyValue((int)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return (VerticalLineAlignment)Interop.Actor.InternalGetPropertyInt(textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment); +#else int temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.VerticalLineAlignment).Get(out temp); return (VerticalLineAlignment)temp; +#endif })); /// This will be public opened in tizen_5.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -603,15 +762,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection, (bool)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection, new Tizen.NUI.PropertyValue((bool)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection); +#else bool temp = false; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MatchSystemLanguageDirection).Get(out temp); return temp; +#endif })); /// This will be public opened in tizen_6.5 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -620,15 +787,23 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing, new Tizen.NUI.PropertyValue((float)newValue)); +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing); +#else float temp = 0; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.CharacterSpacing).Get(out temp); return temp; +#endif })); /// Only for XAML. No need of public API. Make hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] @@ -655,16 +830,24 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.MinLineSize, (float)newValue); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MinLineSize, new Tizen.NUI.PropertyValue((float)newValue)); +#endif textLabel.RequestLayout(); } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.MinLineSize); +#else float temp = 0.0f; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.MinLineSize).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -673,19 +856,28 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.FontSizeScale, (float)newValue); + textLabel.RequestLayout(); +#else using (var property = new Tizen.NUI.PropertyValue((float)newValue)) { Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.FontSizeScale, property); textLabel.RequestLayout(); } +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyFloat(textLabel.SwigCPtr, TextLabel.Property.FontSizeScale); +#else float temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.FontSizeScale).Get(out temp); return temp; +#endif })); [EditorBrowsable(EditorBrowsableState.Never)] @@ -694,19 +886,28 @@ namespace Tizen.NUI.BaseComponents var textLabel = (TextLabel)bindable; if (newValue != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale, (bool)newValue); + textLabel.RequestLayout(); +#else using (var property = new Tizen.NUI.PropertyValue((bool)newValue)) { Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale, property); textLabel.RequestLayout(); } +#endif } }), defaultValueCreator: (BindableProperty.CreateDefaultValueDelegate)((bindable) => { var textLabel = (TextLabel)bindable; +#if NUI_PROPERTY_CHANGE_2 + return Interop.Actor.InternalGetPropertyBool(textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale); +#else bool temp; Tizen.NUI.Object.GetProperty((System.Runtime.InteropServices.HandleRef)textLabel.SwigCPtr, TextLabel.Property.EnableFontSizeScale).Get(out temp); return temp; +#endif })); /// @@ -855,7 +1056,7 @@ namespace Tizen.NUI.BaseComponents { get { - var selector = selectorData?.TextColor?.Get(); + var selector = selectorData?.TextColor?.Get(); if (selector != null) { return selector; @@ -916,7 +1117,11 @@ namespace Tizen.NUI.BaseComponents { if (value != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(SwigCPtr, TextLabel.Property.TEXT, value); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.TEXT, new Tizen.NUI.PropertyValue(value)); +#endif RequestLayout(); } } @@ -925,7 +1130,11 @@ namespace Tizen.NUI.BaseComponents { if (value != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyString(SwigCPtr, TextLabel.Property.FontFamily, value); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.FontFamily, new Tizen.NUI.PropertyValue(value)); +#endif RequestLayout(); } } @@ -934,7 +1143,11 @@ namespace Tizen.NUI.BaseComponents { if (value != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyVector4(SwigCPtr, TextLabel.Property.TextColor, value.SwigCPtr); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.TextColor, new Tizen.NUI.PropertyValue(value)); +#endif } } @@ -942,7 +1155,11 @@ namespace Tizen.NUI.BaseComponents { if (value != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(SwigCPtr, TextLabel.Property.PointSize, (float)value); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.PointSize, new Tizen.NUI.PropertyValue((float)value)); +#endif RequestLayout(); } } @@ -951,7 +1168,11 @@ namespace Tizen.NUI.BaseComponents { if (value != null) { +#if NUI_PROPERTY_CHANGE_2 + Interop.Actor.InternalSetPropertyFloat(SwigCPtr, TextLabel.Property.PixelSize, (float)value); +#else Tizen.NUI.Object.SetProperty((System.Runtime.InteropServices.HandleRef)SwigCPtr, TextLabel.Property.PixelSize, new Tizen.NUI.PropertyValue((float)value)); +#endif RequestLayout(); } } diff --git a/src/Tizen.NUI/src/public/Window/Window.cs b/src/Tizen.NUI/src/public/Window/Window.cs index d600dbc..ff5b257 100755 --- a/src/Tizen.NUI/src/public/Window/Window.cs +++ b/src/Tizen.NUI/src/public/Window/Window.cs @@ -90,10 +90,11 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e) if(e.Key.State == Key.StateType.Down && e.Key.KeyPressedName == "1") { #if NUI_PROPERTY_CHANGE_1 - Tizen.Log.Fatal("NUITEST", $"### (FIXED) currently used View's properties ###"); + Tizen.Log.Fatal("NUITEST", $"### (FIXED) currently used properties ###"); #else - Tizen.Log.Fatal("NUITEST", $"### currently used View's properties ###"); + Tizen.Log.Fatal("NUITEST", $"### currently used properties ###"); #endif + Tizen.Log.Fatal("NUITEST", $"View properties =>"); Tizen.Log.Fatal("NUITEST", $"PropertyValueConstructor: {Tizen.NUI.PropertyValue.PropertyValueConstructor}"); Tizen.Log.Fatal("NUITEST", $"SizeGetter: {View.SizeGetter}, SizeSetter: {View.SizeSetter}"); Tizen.Log.Fatal("NUITEST", $"Size2DGetter: {View.Size2DGetter}, Size2DSetter: {View.Size2DSetter}"); @@ -157,6 +158,14 @@ private void TestWindowKeyEventHandler(object o, Window.KeyEventArgs e) Tizen.Log.Fatal("NUITEST", $"AccessibilityHighlightableGetter: {View.AccessibilityHighlightableGetter}, AccessibilityHighlightableSetter: {View.AccessibilityHighlightableSetter}"); Tizen.Log.Fatal("NUITEST", $"AccessibilityHiddenGetter: {View.AccessibilityHiddenGetter}, AccessibilityHiddenSetter: {View.AccessibilityHiddenSetter}"); Tizen.Log.Fatal("NUITEST", $"AutomationIdGetter: {View.AutomationIdGetter}, AutomationIdSetter: {View.AutomationIdSetter}"); + Tizen.Log.Fatal("NUITEST", $"ImageView properties =>"); + Tizen.Log.Fatal("NUITEST", $"PreMultipliedAlphaGetter: {ImageView.PreMultipliedAlphaGetter}, PreMultipliedAlphaSetter: {ImageView.PreMultipliedAlphaSetter}"); + Tizen.Log.Fatal("NUITEST", $"PixelAreaGetter: {ImageView.PixelAreaGetter}, PixelAreaSetter: {ImageView.PixelAreaSetter}"); + Tizen.Log.Fatal("NUITEST", $"TextLabel properties =>"); + Tizen.Log.Fatal("NUITEST", $"TextGetter: {TextLabel.TextGetter}, TextSetter: {TextLabel.TextSetter}"); + Tizen.Log.Fatal("NUITEST", $"FontFamilyGetter: {TextLabel.FontFamilyGetter}, FontFamilySetter: {TextLabel.FontFamilySetter}"); + Tizen.Log.Fatal("NUITEST", $"PointSizeGetter: {TextLabel.PointSizeGetter}"); + } } #endif -- 2.7.4