From: dongsug.song Date: Fri, 21 Apr 2017 11:09:10 +0000 (+0900) Subject: configure Platform Lite and Log define X-Git-Tag: preview1-00180^2~298 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=af0c9ac608625c31661dce82185f832a9b39ef20;p=platform%2Fcore%2Fcsapi%2Ftizenfx.git configure Platform Lite and Log define Change-Id: Idfcaf635ab96b748e017c74284f71bdcdfe11721 Signed-off-by: dongsug.song --- diff --git a/packaging/csapi-nui.spec b/packaging/csapi-nui.spec index 8264288..269c92c 100755 --- a/packaging/csapi-nui.spec +++ b/packaging/csapi-nui.spec @@ -31,10 +31,11 @@ cp %{SOURCE1} . %build for ASM in %{Assemblies}; do -%dotnet_build $ASM +%dotnet_build $ASM /p:DefineConstants="DOT_NET_CORE","DEBUG_ON" %dotnet_pack $ASM/$ASM.nuspec %{version} done + %install for ASM in %{Assemblies}; do %dotnet_install $ASM diff --git a/src/Tizen.NUI/Tizen.NUI.csproj b/src/Tizen.NUI/Tizen.NUI.csproj index d6ed4c1..529e72d 100755 --- a/src/Tizen.NUI/Tizen.NUI.csproj +++ b/src/Tizen.NUI/Tizen.NUI.csproj @@ -387,4 +387,4 @@ - \ No newline at end of file + diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs index f8d6c00..a0474d1 100755 --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -352,7 +352,9 @@ namespace Tizen.NUI private static void LOG(string str) { - //Tizen.Log.Debug("NUI", str); +#if DEBUG_ON + Tizen.Log.Debug("NUI", str); +#endif } [UnmanagedFunctionPointer(CallingConvention.StdCall)] @@ -1052,10 +1054,13 @@ namespace Tizen.NUI internal void SetupDelegates() { InitDelegateInternal initializeCallback = new InitDelegateInternal(Initialize); +#if DEBUG_ON Tizen.Log.Debug("NUI", "InitSignal connection count"); - +#endif this.InitSignal().Connect(initializeCallback); - //Tizen.Log.Debug("NUI", "InitSignal connection count = " + app.InitSignal().GetConnectionCount() ); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "InitSignal connection count = " + InitSignal().GetConnectionCount() ); +#endif } public static Application NewApplication() @@ -1093,13 +1098,14 @@ namespace Tizen.NUI Tizen.Log.Fatal("NUI", "Dali native version mismatch error! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease + " but native dali=" + ver1 + "." + ver2 + "." + ver3); } } - catch (Exception e) + catch (Exception exc) { //throw new System.InvalidOperationException("Dali native version is very old! nui=" + Version.ver1 + "." + Version.ver2 + "." + Version.ver3); Tizen.Log.Fatal("NUI", "Dali native version is very old! nui=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease); + Tizen.Log.Fatal("NUI", "exception occured! =" + exc.Message); } + LOG(" Dali native version="+ver1 + "." + ver2 + "." + ver3 + " NUI version=" + Version.nuiVer1 + "." + Version.nuiVer2 + "." + Version.nuiVer3 + Version.nuiRelease); } - LOG(" NewApplication(string stylesheet, Application.WindowMode windowMode) is called! "); // register all Views with the type registry, so that can be created / styled via JSON diff --git a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs index 9fcc50b..48b27a7 100755 --- a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs +++ b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs @@ -8,8 +8,8 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -#define DOT_NET_CORE -#if (DOT_NET_CORE) +//#define DOT_NET_CORE +#if DOT_NET_CORE using System.Reflection; #endif @@ -66,7 +66,7 @@ internal class CustomAlgorithmInterface : global::System.IDisposable { NDalicPINVOKE.CustomAlgorithmInterface_director_connect(swigCPtr, swigDelegate0); } -#if (DOT_NET_CORE) +#if DOT_NET_CORE private bool SwigDerivedClassHasMethod(string methodName, global::System.Type[] methodTypes) { global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes); bool hasDerivedMethod = this.GetType().GetTypeInfo().IsSubclassOf(typeof(CustomAlgorithmInterface)); diff --git a/src/Tizen.NUI/src/internal/ItemFactory.cs b/src/Tizen.NUI/src/internal/ItemFactory.cs index dfe6436..301cf84 100755 --- a/src/Tizen.NUI/src/internal/ItemFactory.cs +++ b/src/Tizen.NUI/src/internal/ItemFactory.cs @@ -8,7 +8,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -#define DOT_NET_CORE +//#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif @@ -103,7 +103,9 @@ namespace Tizen.NUI { global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes); bool hasDerivedMethod = this.GetType().GetTypeInfo().IsSubclassOf(typeof(ItemFactory)); +#if DEBUG_ON Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod); +#endif return hasDerivedMethod && (methodInfo != null); } #else diff --git a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs index c342605..f07665d 100755 --- a/src/Tizen.NUI/src/internal/PropertyRangeManager.cs +++ b/src/Tizen.NUI/src/internal/PropertyRangeManager.cs @@ -1,5 +1,5 @@ -#define DOT_NET_CORE +//#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif @@ -102,8 +102,9 @@ namespace Tizen.NUI // for every base class increase property start index startEventPropertyIndex += (int)Tizen.NUI.PropertyRanges.DEFAULT_PROPERTY_MAX_COUNT_PER_DERIVATION; // DALi uses 10,000 startAnimatablePropertyIndex += maxCountPerDerivation; - - //Tizen.Log.Debug("NUI", "getStartPropertyIndex = " + viewType.Name +"current index " + startEventPropertyIndex); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "getStartPropertyIndex = " + viewType.Name +"current index " + startEventPropertyIndex); +#endif #if (DOT_NET_CORE) viewType = viewType.GetTypeInfo().BaseType; #else diff --git a/src/Tizen.NUI/src/internal/ViewImpl.cs b/src/Tizen.NUI/src/internal/ViewImpl.cs index 858deea..ee8fb26 100755 --- a/src/Tizen.NUI/src/internal/ViewImpl.cs +++ b/src/Tizen.NUI/src/internal/ViewImpl.cs @@ -8,7 +8,6 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ -#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif @@ -581,7 +580,9 @@ namespace Tizen.NUI global::System.Reflection.MethodInfo methodInfo = this.GetType().GetMethod(methodName, methodTypes); bool hasDerivedMethod = this.GetType().GetTypeInfo().IsSubclassOf(typeof(ViewImpl)); +#if DEBUG_ON Tizen.Log.Debug("NUI-APP", "hasDerivedMethod=" + hasDerivedMethod); +#endif return hasDerivedMethod && (methodInfo != null); } #else diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs index 94a6c43..f773f38 100755 --- a/src/Tizen.NUI/src/internal/ViewRegistry.cs +++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs @@ -1,5 +1,5 @@ -#define DOT_NET_CORE +//#define DOT_NET_CORE #if (DOT_NET_CORE) using System.Reflection; #endif @@ -194,12 +194,16 @@ namespace Tizen.NUI Tizen.NUI.PropertyType daliType; if (_daliPropertyTypeLookup.TryGetValue(cSharpTypeName, out daliType)) { - //Tizen.Log.Debug("NUI", "mapped "+ cSharpTypeName + " to dAli type " +daliType ); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "mapped "+ cSharpTypeName + " to dAli type " +daliType ); +#endif return daliType; } else { - // Tizen.Log.Debug("NUI", "Failed to find a mapping between C# property" + cSharpTypeName +" and DALi type"); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "Failed to find a mapping between C# property" + cSharpTypeName +" and DALi type"); +#endif return PropertyType.None; } } @@ -212,8 +216,9 @@ namespace Tizen.NUI private static IntPtr CreateControl(IntPtr cPtrControlName) { string controlName = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(cPtrControlName); - // Tizen.Log.Debug("NUI", "Create controlled called from C++ create a " + controlName); - +#if DEBUG_ON + Tizen.Log.Debug("NUI", "Create controlled called from C++ create a " + controlName); +#endif Func controlConstructor; // find the control constructor @@ -240,7 +245,9 @@ namespace Tizen.NUI RefObject refObj = view.GetObjectPtr(); IntPtr refCptr = (IntPtr)RefObject.getCPtr(refObj); - //Tizen.Log.Debug("NUI", "________Storing ref object cptr in control map Hex: {0:X}", refCptr); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "________Storing ref object cptr in control map Hex: {0:X}"+ refCptr); +#endif if (!Instance._controlMap.ContainsKey(refCptr)) { Instance._controlMap.Add(refCptr, new WeakReference(view, false)); @@ -275,7 +282,9 @@ namespace Tizen.NUI private static void SetProperty(IntPtr controlPtr, IntPtr propertyName, IntPtr propertyValue) { string name = System.Runtime.InteropServices.Marshal.PtrToStringAnsi(propertyName); - //Tizen.Log.Debug("NUI", SetControlProperty called for:" + name ); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "SetControlProperty called for:" + name ); +#endif Instance.SetPropertyValue(controlPtr, name, propertyValue); } @@ -355,8 +364,9 @@ namespace Tizen.NUI // If the Scriptable attribute exists, then register it with the type registry. if (attr is ScriptableProperty) { - //Tizen.Log.Debug("NUI", "Got a DALi JSON scriptable property = " + propertyInfo.Name +", of type " + propertyInfo.PropertyType.Name); - +#if DEBUG_ON + Tizen.Log.Debug("NUI", "Got a DALi JSON scriptable property = " + propertyInfo.Name +", of type " + propertyInfo.PropertyType.Name); +#endif // first get the attribute type, ( default, or animatable) ScriptableProperty scriptableProp = attr as ScriptableProperty; @@ -371,7 +381,9 @@ namespace Tizen.NUI TypeRegistration.RegisterProperty(viewType.Name, propertyInfo.Name, propertyIndex, propertyType, _setPropertyCallback, _getPropertyCallback); } } - // Tizen.Log.Debug("NUI", "property name = " + propertyInfo.Name); +#if DEBUG_ON + Tizen.Log.Debug("NUI", "property name = " + propertyInfo.Name); +#endif } } } @@ -414,9 +426,9 @@ namespace Tizen.NUI private void SetPropertyValue(IntPtr controlPtr, string propertyName, IntPtr propertyValuePtr) { // Get the C# control that maps to the C++ control - - //Tizen.Log.Debug("NUI", "SetPropertyValue refObjectPtr = {0:X}", controlPtr); - +#if DEBUG_ON + Tizen.Log.Debug("NUI", "SetPropertyValue refObjectPtr = {0:X}"+ controlPtr); +#endif PropertyValue propValue = new PropertyValue(propertyValuePtr, false); WeakReference viewReference; diff --git a/src/Tizen.NUI/src/public/Actor.cs b/src/Tizen.NUI/src/public/Actor.cs index 695efc2..b381575 100755 --- a/src/Tizen.NUI/src/public/Actor.cs +++ b/src/Tizen.NUI/src/public/Actor.cs @@ -1781,7 +1781,9 @@ namespace Tizen.NUI string temp; if (GetProperty(Actor.Property.COLOR_MODE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "ColorMode get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "ColorMode get error!"); +#endif } switch (temp) { @@ -1819,7 +1821,9 @@ namespace Tizen.NUI string temp; if (GetProperty(Actor.Property.DRAW_MODE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "DrawMode get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "DrawMode get error!"); +#endif } switch (temp) { @@ -1868,7 +1872,9 @@ namespace Tizen.NUI string temp; if (GetProperty(Actor.Property.WIDTH_RESIZE_POLICY).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "WidthResizePolicy get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "WidthResizePolicy get error!"); +#endif } switch (temp) { @@ -1908,7 +1914,9 @@ namespace Tizen.NUI string temp; if (GetProperty(Actor.Property.HEIGHT_RESIZE_POLICY).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "HeightResizePolicy get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "HeightResizePolicy get error!"); +#endif } switch (temp) { @@ -1949,7 +1957,9 @@ namespace Tizen.NUI string temp; if (GetProperty(Actor.Property.SIZE_SCALE_POLICY).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "SizeScalePolicy get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "SizeScalePolicy get error!"); +#endif } switch (temp) { @@ -2109,7 +2119,9 @@ namespace Tizen.NUI string temp; if (GetProperty(Actor.Property.CLIPPING_MODE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "ClippingMode get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "ClippingMode get error!"); +#endif } switch (temp) { diff --git a/src/Tizen.NUI/src/public/Animation.cs b/src/Tizen.NUI/src/public/Animation.cs index 2e7e182..16a23ac 100755 --- a/src/Tizen.NUI/src/public/Animation.cs +++ b/src/Tizen.NUI/src/public/Animation.cs @@ -827,6 +827,9 @@ namespace Tizen.NUI { NDalicPINVOKE.Animation_Play(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); +#if DISABLE_ANIMATION + Stop(EndActions.StopFinal); +#endif } /// diff --git a/src/Tizen.NUI/src/public/CameraActor.cs b/src/Tizen.NUI/src/public/CameraActor.cs index b276ab6..755b234 100755 --- a/src/Tizen.NUI/src/public/CameraActor.cs +++ b/src/Tizen.NUI/src/public/CameraActor.cs @@ -319,7 +319,9 @@ namespace Tizen.NUI string temp; if (GetProperty(CameraActor.Property.TYPE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "CameraType get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "CameraType get error!"); +#endif } switch (temp) { @@ -366,7 +368,9 @@ namespace Tizen.NUI string temp; if (GetProperty(CameraActor.Property.PROJECTION_MODE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "ProjectionMode get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "ProjectionMode get error!"); +#endif } switch(temp) { diff --git a/src/Tizen.NUI/src/public/CustomView/VisualView.cs b/src/Tizen.NUI/src/public/CustomView/VisualView.cs index e6c8b23..3bb3ba0 100755 --- a/src/Tizen.NUI/src/public/CustomView/VisualView.cs +++ b/src/Tizen.NUI/src/public/CustomView/VisualView.cs @@ -188,8 +188,9 @@ namespace Tizen.NUI _tranformDictionary[visualIndex] = visualMap.OutputTransformMap; RelayoutRequest(); - +#if DEBUG_ON Tizen.Log.Debug("NUI", "UpdateVisual() name=" + visualName); +#endif } /// diff --git a/src/Tizen.NUI/src/public/NUIApplication.cs b/src/Tizen.NUI/src/public/NUIApplication.cs index 3b893d2..c7c09e2 100755 --- a/src/Tizen.NUI/src/public/NUIApplication.cs +++ b/src/Tizen.NUI/src/public/NUIApplication.cs @@ -29,8 +29,9 @@ namespace Tizen.NUI { private void LOG(string _str) { - //Tizen.Log.Debug("NUI", _str); - //Tizen.Log.Debug("NUI", "[NUI]" + _str); +#if DEBUG_ON + Tizen.Log.Debug("NUI", _str); +#endif } /// @@ -113,8 +114,9 @@ namespace Tizen.NUI { // Initialize DisposeQueue Singleton class. DisposeQueue disposeQ = DisposeQueue.Instance; +#if DEBUG_ON Tizen.Log.Debug("NUI", "##### 1) DisposeQueue.Instance.Initialize()!"); - +#endif switch (_appMode) { case AppMode.Default: @@ -134,8 +136,9 @@ namespace Tizen.NUI // This is also required to create DisposeQueue on main thread. disposeQ.Initialize(); +#if DEBUG_ON Tizen.Log.Debug("NUI", "##### 2) DisposeQueue.Instance.Initialize()!"); - +#endif _stage = Stage.Instance; _stage.SetBackgroundColor(Color.White); LOG("OnPreCreate() is called!"); @@ -251,4 +254,4 @@ namespace Tizen.NUI } } } -} \ No newline at end of file +} diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs index e643178..f0c93a3 100755 --- a/src/Tizen.NUI/src/public/Property.cs +++ b/src/Tizen.NUI/src/public/Property.cs @@ -963,94 +963,79 @@ namespace Tizen.NUI if (type.Equals(typeof(int))) { - Tizen.Log.Debug("NUI", " got an int property value "); value = new PropertyValue((int)obj); } if (type.Equals(typeof(System.Int32))) { - Tizen.Log.Debug("NUI", " got an int property value "); value = new PropertyValue((int)obj); } else if (type.Equals(typeof(bool))) { - Tizen.Log.Debug("NUI", " got an bool property value "); value = new PropertyValue((bool)obj); } else if (type.Equals(typeof(float))) { - Tizen.Log.Debug("NUI", " got an float property value "); value = new PropertyValue((float)obj); } else if (type.Equals(typeof(string))) { - Tizen.Log.Debug("NUI", " got a string property value "); value = new PropertyValue((string)obj); } else if (type.Equals(typeof(Vector2))) { - Tizen.Log.Debug("NUI", " got an Vector2 property value "); value = new PropertyValue((Vector2)obj); } else if (type.Equals(typeof(Vector3))) { - Tizen.Log.Debug("NUI", " got an Vector3 property value "); value = new PropertyValue((Vector3)obj); } else if (type.Equals(typeof(Vector4))) { - Tizen.Log.Debug("NUI", " got an Vector4 property value "); - value = new PropertyValue((Vector4)obj); } else if (type.Equals(typeof(Position))) { - Tizen.Log.Debug("NUI", " got an Position property value "); value = new PropertyValue((Position)obj); } else if (type.Equals(typeof(Position2D))) { - Tizen.Log.Debug("NUI", " got an Position2D property value "); value = new PropertyValue((Position2D)obj); } else if (type.Equals(typeof(Size))) { - Tizen.Log.Debug("NUI", " got an Size property value "); value = new PropertyValue((Size)obj); } else if (type.Equals(typeof(Size2D))) { - Tizen.Log.Debug("NUI", " got an Size2D property value "); value = new PropertyValue((Size2D)obj); } else if (type.Equals(typeof(Color))) { - Tizen.Log.Debug("NUI", " got an Color property value "); value = new PropertyValue((Color)obj); } else if (type.Equals(typeof(Rotation))) { - Tizen.Log.Debug("NUI", " got an Rotation property value "); value = new PropertyValue((Rotation)obj); } else if (type.Equals(typeof(RelativeVector2))) { - Tizen.Log.Debug("NUI", " got an RelativeVector2 property value "); value = new PropertyValue((RelativeVector2)obj); } else if (type.Equals(typeof(RelativeVector3))) { - Tizen.Log.Debug("NUI", " got an RelativeVector3 property value "); value = new PropertyValue((RelativeVector3)obj); } else if (type.Equals(typeof(RelativeVector4))) { - Tizen.Log.Debug("NUI", " got an RelativeVector4 property value "); value = new PropertyValue((RelativeVector4)obj); } else { throw new global::System.InvalidOperationException("Unimplemented type for Property Value :" + type.Name); } +#if DEBUG_ON + Tizen.Log.Debug("NUI", " got an property value of =" + type.Name); +#endif return value; } diff --git a/src/Tizen.NUI/src/public/UIComponents/Button.cs b/src/Tizen.NUI/src/public/UIComponents/Button.cs index 3b9dd3c..911aa32 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Button.cs +++ b/src/Tizen.NUI/src/public/UIComponents/Button.cs @@ -407,7 +407,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(Button.Property.LABEL_RELATIVE_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "LabelRelativeAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "LabelRelativeAlignment get error!"); +#endif } switch (temp) { @@ -970,4 +972,4 @@ namespace Tizen.NUI.UIComponents } -} \ No newline at end of file +} diff --git a/src/Tizen.NUI/src/public/UIComponents/Popup.cs b/src/Tizen.NUI/src/public/UIComponents/Popup.cs index f35ba4a..a11152d 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Popup.cs +++ b/src/Tizen.NUI/src/public/UIComponents/Popup.cs @@ -638,7 +638,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(Popup.Property.DISPLAY_STATE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "DisplayState get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "DisplayState get error!"); +#endif } switch (temp) { @@ -746,7 +748,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(Popup.Property.CONTEXTUAL_MODE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "ContextualMode get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "ContextualMode get error!"); +#endif } switch (temp) { @@ -829,7 +833,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(Popup.Property.ANIMATION_MODE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "AnimationMode get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "AnimationMode get error!"); +#endif } switch (temp) { diff --git a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs index a7bde36..b627f63 100755 --- a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs @@ -252,7 +252,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(PushButton.Property.ICON_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "IconAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "IconAlignment get error!"); +#endif } switch (temp) { diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 46c07cc..adb4914 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -449,7 +449,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(ScrollBar.Property.SCROLL_DIRECTION).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "ScrollDirection get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "ScrollDirection get error!"); +#endif } switch (temp) @@ -497,7 +499,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(ScrollBar.Property.INDICATOR_HEIGHT_POLICY).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "IndicatorHeightPolicy get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "IndicatorHeightPolicy get error!"); +#endif } switch (temp) diff --git a/src/Tizen.NUI/src/public/UIComponents/TextEditor.cs b/src/Tizen.NUI/src/public/UIComponents/TextEditor.cs index 513cc6f..1028af0 100755 --- a/src/Tizen.NUI/src/public/UIComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/UIComponents/TextEditor.cs @@ -466,7 +466,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(TextEditor.Property.HORIZONTAL_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "HorizontalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "HorizontalAlignment get error!"); +#endif } switch (temp) diff --git a/src/Tizen.NUI/src/public/UIComponents/TextField.cs b/src/Tizen.NUI/src/public/UIComponents/TextField.cs index 6cd9ed3..796f030 100755 --- a/src/Tizen.NUI/src/public/UIComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/UIComponents/TextField.cs @@ -601,7 +601,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(TextField.Property.HORIZONTAL_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "HorizontalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "HorizontalAlignment get error!"); +#endif } switch (temp) @@ -656,7 +658,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(TextField.Property.VERTICAL_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "VerticalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "VerticalAlignment get error!"); +#endif } switch (temp) diff --git a/src/Tizen.NUI/src/public/UIComponents/TextLabel.cs b/src/Tizen.NUI/src/public/UIComponents/TextLabel.cs index 2bfbb02..3de2162 100755 --- a/src/Tizen.NUI/src/public/UIComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/UIComponents/TextLabel.cs @@ -314,7 +314,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(TextLabel.Property.HORIZONTAL_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "HorizontalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "HorizontalAlignment get error!"); +#endif } switch (temp) { @@ -369,7 +371,9 @@ namespace Tizen.NUI.UIComponents string temp; if (GetProperty(TextLabel.Property.VERTICAL_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "VerticalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "VerticalAlignment get error!"); +#endif } switch (temp) diff --git a/src/Tizen.NUI/src/public/View.cs b/src/Tizen.NUI/src/public/View.cs index b6e12c1..277bbf2 100755 --- a/src/Tizen.NUI/src/public/View.cs +++ b/src/Tizen.NUI/src/public/View.cs @@ -962,7 +962,9 @@ namespace Tizen.NUI int temp = 0; if (GetProperty(View.Property.STATE).Get(ref temp) == false) { - //Tizen.Log.Error("NUI", "State get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "State get error!"); +#endif } switch (temp) { @@ -1000,7 +1002,9 @@ namespace Tizen.NUI string temp; if (GetProperty(View.Property.SUB_STATE).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "subState get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "subState get error!"); +#endif } switch (temp) { @@ -1244,7 +1248,9 @@ namespace Tizen.NUI string temp; if (GetProperty(TableView.ChildProperty.CELL_HORIZONTAL_ALIGNMENT).Get(out temp) == false) { - //Tizen.Log.Error("NUI", "CellHorizontalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "CellHorizontalAlignment get error!"); +#endif } switch (temp) @@ -1299,7 +1305,9 @@ namespace Tizen.NUI string temp; GetProperty(TableView.ChildProperty.CELL_VERTICAL_ALIGNMENT).Get(out temp); { - //Tizen.Log.Error("NUI", "CellVerticalAlignment get error!"); +#if DEBUG_ON + Tizen.Log.Error("NUI", "CellVerticalAlignment get error!"); +#endif } switch (temp) diff --git a/src/Tizen.NUI/src/public/VisualMaps.cs b/src/Tizen.NUI/src/public/VisualMaps.cs index 20d467b..cec7ed3 100755 --- a/src/Tizen.NUI/src/public/VisualMaps.cs +++ b/src/Tizen.NUI/src/public/VisualMaps.cs @@ -222,12 +222,16 @@ namespace Tizen.NUI { if (VisualIndex > 0) { +#if DEBUG_ON Tizen.Log.Debug("NUI", "UpdateVisual()! VisualIndex=" + VisualIndex); +#endif Parent.UpdateVisual(VisualIndex, Name, this); } else { +#if DEBUG_ON Tizen.Log.Debug("NUI", "VisualIndex was not set"); +#endif } }