From 066d415467a664d1a24b7aa235842a3670e1bb2a Mon Sep 17 00:00:00 2001 From: "huiyu.eun" Date: Wed, 18 Nov 2020 16:39:34 +0900 Subject: [PATCH] Follow formatting NUI Signed-off-by: huiyu.eun --- src/Tizen.NUI.Components/Controls/ButtonGroup.cs | 4 +- src/Tizen.NUI.Components/Controls/DropDown.cs | 18 +- .../Controls/FlexibleView/OrientationHelper.cs | 60 +-- .../Controls/ImageScrollBar.cs | 2 +- src/Tizen.NUI.Components/Controls/Loading.cs | 46 +- .../Controls/Navigation/Page.cs | 28 +- src/Tizen.NUI.Components/Controls/Pagination.cs | 6 +- src/Tizen.NUI.Components/Controls/Popup.cs | 14 +- .../RecyclerView/GridRecycleLayoutManager.cs | 46 +- .../RecyclerView/LinearRecycleLayoutManager.cs | 88 ++-- .../Controls/RecyclerView/RecycleAdapter.cs | 3 +- .../Controls/RecyclerView/RecycleLayoutManager.cs | 14 +- .../Controls/RecyclerView/RecyclerView.cs | 38 +- src/Tizen.NUI.Components/Controls/Scrollbar.cs | 26 +- src/Tizen.NUI.Components/Controls/SelectButton.cs | 2 +- src/Tizen.NUI.Components/Controls/Slider.cs | 8 +- src/Tizen.NUI.Components/Controls/Tab.cs | 22 +- src/Tizen.NUI.Components/Controls/Toast.cs | 2 +- .../PreloadStyle/OverlayAnimationButtonStyle.cs | 10 +- src/Tizen.NUI.Components/Style/ButtonStyle.cs | 2 +- src/Tizen.NUI.Components/Style/ControlStyle.cs | 2 +- src/Tizen.NUI.Components/Utils/StyleManager.cs | 2 +- src/Tizen.NUI.Components/Utils/Utility.cs | 6 +- src/Tizen.NUI/src/internal/Alignment.cs | 2 +- src/Tizen.NUI/src/internal/Application.cs | 8 +- src/Tizen.NUI/src/internal/BackKeyManager.cs | 32 +- src/Tizen.NUI/src/internal/CustomActor.cs | 2 +- .../src/internal/CustomAlgorithmInterface.cs | 2 +- src/Tizen.NUI/src/internal/DisposeQueue.cs | 6 +- src/Tizen.NUI/src/internal/EnvironmentVariable.cs | 2 +- src/Tizen.NUI/src/internal/Extensions.cs | 2 +- .../src/internal/FrameBroker/DefaultFrameBroker.cs | 8 +- src/Tizen.NUI/src/internal/FriendAssembly.cs | 5 +- .../src/internal/Interop/Interop.Animation.cs | 2 +- .../src/internal/Interop/Interop.BaseObject.cs | 2 +- .../src/internal/Interop/Interop.CameraActor.cs | 2 +- .../src/internal/Interop/Interop.Capture.cs | 2 +- .../Interop/Interop.ComponentApplication.cs | 44 +- .../src/internal/Interop/Interop.GLWindow.cs | 4 +- .../src/internal/Interop/Interop.Geometry.cs | 2 +- .../internal/Interop/Interop.GestureDetector.cs | 2 +- .../src/internal/Interop/Interop.GlyphInfo.cs | 2 +- .../src/internal/Interop/Interop.Matrix.cs | 2 +- .../src/internal/Interop/Interop.Model3DView.cs | 2 +- .../src/internal/Interop/Interop.NDalic.cs | 104 ++-- .../internal/Interop/Interop.PanGestureDetector.cs | 2 +- .../src/internal/Interop/Interop.PixelData.cs | 2 +- .../src/internal/Interop/Interop.ProgressBar.cs | 2 +- .../src/internal/Interop/Interop.RefObject.cs | 2 +- .../src/internal/Interop/Interop.TableView.cs | 2 +- .../src/internal/Interop/Interop.TextField.cs | 6 +- src/Tizen.NUI/src/internal/Interop/Interop.Util.cs | 2 +- .../src/internal/Interop/Interop.Vector2.cs | 4 +- .../src/internal/Interop/Interop.Vector3.cs | 6 +- .../src/internal/Interop/Interop.Vector4.cs | 4 +- .../internal/Interop/Interop.VectorUnsignedChar.cs | 10 +- src/Tizen.NUI/src/internal/Interop/Interop.View.cs | 2 +- .../src/internal/Interop/Interop.WidgetImpl.cs | 2 +- .../src/internal/Interop/Interop.Window.cs | 8 +- .../src/internal/Interop/ManualPINVOKE.cs | 2 +- .../src/internal/Interop/NDalicPINVOKE.cs | 248 ++++----- src/Tizen.NUI/src/internal/ItemView.cs | 2 +- .../src/internal/KeyboardTypeSignalType.cs | 14 +- .../Layouting/Interop/Interop.FlexLayout.cs | 16 +- .../src/internal/Layouting/LayoutController.cs | 90 ++-- src/Tizen.NUI/src/internal/Layouting/LayoutData.cs | 14 +- src/Tizen.NUI/src/internal/LinearConstrainer.cs | 2 +- src/Tizen.NUI/src/internal/LowMemorySignalType.cs | 2 +- src/Tizen.NUI/src/internal/Model3dView.cs | 2 +- .../src/internal/NUIComponentCoreBackend.cs | 6 +- src/Tizen.NUI/src/internal/NUICoreBackend.cs | 68 +-- src/Tizen.NUI/src/internal/NUIWidgetCoreBackend.cs | 50 +- src/Tizen.NUI/src/internal/Object.cs | 2 +- .../src/internal/PageTurnLandscapeView.cs | 2 +- src/Tizen.NUI/src/internal/PageTurnPortraitView.cs | 2 +- src/Tizen.NUI/src/internal/PageTurnView.cs | 2 +- src/Tizen.NUI/src/internal/PathConstrainer.cs | 2 +- src/Tizen.NUI/src/internal/Registry.cs | 2 +- src/Tizen.NUI/src/internal/RenderTask.cs | 2 +- src/Tizen.NUI/src/internal/RenderTaskList.cs | 2 +- src/Tizen.NUI/src/internal/Ruler.cs | 2 +- src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs | 2 +- src/Tizen.NUI/src/internal/SWIGTYPE_p_tm.cs | 2 +- src/Tizen.NUI/src/internal/VersionCheck.cs | 4 +- src/Tizen.NUI/src/internal/VideoViewSignal.cs | 3 +- src/Tizen.NUI/src/internal/WatchApplication.cs | 20 +- src/Tizen.NUI/src/internal/WidgetApplication.cs | 8 +- src/Tizen.NUI/src/internal/WidgetImpl.cs | 4 +- src/Tizen.NUI/src/internal/WidgetViewSignal.cs | 14 +- .../src/internal/Xaml/ApplyPropertiesVisitor.cs | 128 +++-- .../src/internal/Xaml/CreateValuesVisitor.cs | 69 ++- .../src/internal/Xaml/ExpandMarkupsVisitor.cs | 12 +- .../Xaml/FillResourceDictionariesVisitor.cs | 14 +- .../src/internal/Xaml/MarkupExpressionParser.cs | 8 +- .../src/internal/Xaml/MarkupExtensionParser.cs | 6 +- .../src/internal/Xaml/NamescopingVisitor.cs | 2 +- src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs | 14 +- .../src/internal/Xaml/TypeArgumentsParser.cs | 13 +- .../src/internal/Xaml/TypeConversionExtensions.cs | 31 +- .../src/internal/Xaml/VisualStateManager.cs | 16 +- src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs | 5 +- src/Tizen.NUI/src/internal/Xaml/XamlNode.cs | 21 +- src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs | 3 +- src/Tizen.NUI/src/internal/Xaml/XamlParser.cs | 107 ++-- src/Tizen.NUI/src/internal/Xaml/XmlName.cs | 4 +- src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs | 9 +- .../src/internal/XamlBinding/BindingExpression.cs | 11 +- .../src/internal/XamlBinding/DependencyResolver.cs | 2 +- .../src/internal/XamlBinding/DependencyService.cs | 2 +- .../internal/XamlBinding/ExtentsTypeConverter.cs | 2 +- .../src/internal/XamlBinding/FlowDirection.cs | 3 +- .../XamlBinding/Internals/PreserveAttribute.cs | 26 +- .../XamlBinding/Internals/ResourceLoader.cs | 6 +- .../XamlBinding/ListStringTypeConverter.cs | 4 +- .../src/internal/XamlBinding/MergedStyle.cs | 19 +- .../internal/XamlBinding/NUIConstantExtension.cs | 2 +- src/Tizen.NUI/src/internal/XamlBinding/OnIdiom.cs | 2 +- .../src/internal/XamlBinding/OnPlatform.cs | 27 +- .../internal/XamlBinding/PositionTypeConverter.cs | 6 +- .../internal/XamlBinding/RectangleTypeConverter.cs | 2 +- .../internal/XamlBinding/RotationTypeConverter.cs | 8 +- .../internal/XamlBinding/StyleSheets/CssReader.cs | 6 +- .../internal/XamlBinding/StyleSheets/Selector.cs | 185 +++---- .../src/internal/XamlBinding/StyleSheets/Style.cs | 65 +-- .../internal/XamlBinding/StyleSheets/StyleSheet.cs | 53 +- .../StyleSheets/StyleSheetServiceProvider.cs | 3 +- .../StyleSheets/TextReaderExtensions.cs | 26 +- .../src/internal/XamlBinding/SynchronizedList.cs | 4 +- .../internal/XamlBinding/VectorTypeConverter.cs | 12 +- src/Tizen.NUI/src/public/Animation.cs | 2 +- src/Tizen.NUI/src/public/AutofillContainer.cs | 2 +- .../BaseComponents/AnimatedVectorImageView.cs | 4 +- .../src/public/BaseComponents/ControlState.cs | 2 +- .../src/public/BaseComponents/ImageView.cs | 68 +-- .../public/BaseComponents/LottieAnimationView.cs | 6 +- .../src/public/BaseComponents/Style/Selector.cs | 2 +- .../src/public/BaseComponents/Style/ViewStyle.cs | 6 +- .../Style/ViewStyleBindableProperty.cs | 4 +- .../src/public/BaseComponents/TextEditor.cs | 4 +- .../src/public/BaseComponents/TextLabel.cs | 2 +- .../src/public/BaseComponents/TextUtils.cs | 291 ++++++----- .../src/public/BaseComponents/VideoView.cs | 2 +- src/Tizen.NUI/src/public/BaseComponents/View.cs | 50 +- .../src/public/BaseComponents/ViewEnum.cs | 4 +- .../src/public/BaseComponents/ViewEvent.cs | 8 +- .../src/public/BaseComponents/ViewInternal.cs | 2 +- .../src/public/BaseComponents/ViewPublicMethods.cs | 8 +- .../src/public/BaseComponents/ViewSelectorData.cs | 6 +- src/Tizen.NUI/src/public/BaseHandle.cs | 2 +- .../src/public/Events/GestureDetectorManager.cs | 286 +++++----- src/Tizen.NUI/src/public/FocusManager.cs | 4 +- src/Tizen.NUI/src/public/FrameCallbackInterface.cs | 2 +- src/Tizen.NUI/src/public/GLWindow.cs | 8 +- src/Tizen.NUI/src/public/GLWindowEvent.cs | 9 +- src/Tizen.NUI/src/public/Geometry.cs | 2 +- src/Tizen.NUI/src/public/InputMethod.cs | 6 +- src/Tizen.NUI/src/public/Layer.cs | 4 +- src/Tizen.NUI/src/public/Layouting/LayoutItem.cs | 2 +- src/Tizen.NUI/src/public/Layouting/LayoutLength.cs | 6 +- .../src/public/Layouting/LayoutTransition.cs | 31 +- src/Tizen.NUI/src/public/Layouting/MeasuredSize.cs | 4 +- src/Tizen.NUI/src/public/NUIWidgetApplication.cs | 12 +- src/Tizen.NUI/src/public/NativeImageSource.cs | 6 +- src/Tizen.NUI/src/public/PaddingType.cs | 6 +- src/Tizen.NUI/src/public/PinchGestureDetector.cs | 2 +- src/Tizen.NUI/src/public/Position.cs | 4 +- src/Tizen.NUI/src/public/Position2D.cs | 2 +- src/Tizen.NUI/src/public/PropertyNotification.cs | 6 +- src/Tizen.NUI/src/public/PropertyNotifySignal.cs | 14 +- src/Tizen.NUI/src/public/Rectangle.cs | 6 +- src/Tizen.NUI/src/public/RelativeVector2.cs | 2 +- src/Tizen.NUI/src/public/RelativeVector3.cs | 2 +- src/Tizen.NUI/src/public/RelativeVector4.cs | 2 +- .../src/public/RotationGestureDetector.cs | 2 +- src/Tizen.NUI/src/public/Size.cs | 4 +- src/Tizen.NUI/src/public/Theme/ThemeManager.cs | 4 +- src/Tizen.NUI/src/public/Timer.cs | 2 +- .../public/TransitionOptions/TransitionOptions.cs | 2 +- src/Tizen.NUI/src/public/UIComponents/Button.cs | 328 ++++++------ .../src/public/UIComponents/ScrollViewEvent.cs | 2 +- src/Tizen.NUI/src/public/UIComponents/Slider.cs | 219 ++++---- src/Tizen.NUI/src/public/Utility/TextPageUtil.cs | 576 +++++++++++---------- src/Tizen.NUI/src/public/VertexBuffer.cs | 6 +- .../src/public/ViewProperty/ShadowBase.cs | 2 +- src/Tizen.NUI/src/public/WidgetView.cs | 4 +- src/Tizen.NUI/src/public/WindowEvent.cs | 13 +- .../src/public/Xaml/IReferenceProvider.cs | 4 +- .../Xaml/MarkupExtensions/BindingExtension.cs | 6 +- .../MarkupExtensions/DynamicResourceExtension.cs | 2 +- .../Xaml/MarkupExtensions/ReferenceExtension.cs | 4 +- .../Xaml/MarkupExtensions/StaticExtension.cs | 6 +- .../Xaml/MarkupExtensions/StyleSheetExtension.cs | 9 +- .../public/Xaml/MarkupExtensions/TypeExtension.cs | 2 +- .../src/public/Xaml/ProvideCompiledAttribute.cs | 18 +- .../src/public/Xaml/StaticResourceExtension.cs | 33 +- src/Tizen.NUI/src/public/Xaml/ViewExtensions.cs | 2 +- .../src/public/Xaml/XamlResourceIdAttribute.cs | 15 +- .../src/public/Xaml/XamlServiceProvider.cs | 48 +- .../src/public/XamlBinding/BindableObject.cs | 30 +- .../src/public/XamlBinding/BindableProperty.cs | 4 +- .../XamlBinding/BindablePropertyConverter.cs | 5 +- src/Tizen.NUI/src/public/XamlBinding/Binding.cs | 12 +- .../src/public/XamlBinding/BindingBase.cs | 37 +- src/Tizen.NUI/src/public/XamlBinding/Element.cs | 2 +- .../XamlBinding/Interactivity/DataTrigger.cs | 2 +- .../XamlBinding/Interactivity/MultiTrigger.cs | 2 +- .../Interactivity/XamlPropertyCondition.cs | 2 +- .../src/public/XamlBinding/Internals/INameScope.cs | 2 +- .../src/public/XamlBinding/ResourceDictionary.cs | 37 +- src/Tizen.NUI/src/public/XamlBinding/Style.cs | 2 +- src/Tizen.NUI/src/public/XamlBinding/Trigger.cs | 2 +- .../src/public/XamlBinding/TypedBinding.cs | 95 ++-- 212 files changed, 2488 insertions(+), 2233 deletions(-) mode change 100644 => 100755 src/Tizen.NUI.Components/Controls/RecyclerView/RecycleAdapter.cs mode change 100644 => 100755 src/Tizen.NUI.Components/Controls/RecyclerView/RecycleLayoutManager.cs mode change 100644 => 100755 src/Tizen.NUI/src/internal/Interop/Interop.GLWindow.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/BaseComponents/ControlState.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/BaseComponents/ImageView.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/GLWindowEvent.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/NUIWidgetApplication.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/Theme/ThemeManager.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/VertexBuffer.cs mode change 100644 => 100755 src/Tizen.NUI/src/public/ViewProperty/ShadowBase.cs diff --git a/src/Tizen.NUI.Components/Controls/ButtonGroup.cs b/src/Tizen.NUI.Components/Controls/ButtonGroup.cs index 8859ca8..3c82d9d 100755 --- a/src/Tizen.NUI.Components/Controls/ButtonGroup.cs +++ b/src/Tizen.NUI.Components/Controls/ButtonGroup.cs @@ -157,7 +157,7 @@ namespace Tizen.NUI.Components if (btGroup.itemGroup != null && newValue != null) { foreach (Button btn in btGroup.itemGroup) - { + { btn.BackgroundImage = (string)newValue; } btGroup.itemBackgroundImageUrl = (string)newValue; @@ -177,7 +177,7 @@ namespace Tizen.NUI.Components if (btGroup.itemGroup != null && newValue != null) { foreach (Button btn in btGroup.itemGroup) - { + { btn.BackgroundImageBorder = (Rectangle)newValue; } btGroup.itemBackgroundBorder = (Rectangle)newValue; diff --git a/src/Tizen.NUI.Components/Controls/DropDown.cs b/src/Tizen.NUI.Components/Controls/DropDown.cs index ade1697..5dc75be 100755 --- a/src/Tizen.NUI.Components/Controls/DropDown.cs +++ b/src/Tizen.NUI.Components/Controls/DropDown.cs @@ -399,9 +399,9 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public void AddItem(DropDownDataItem itemData) { - // Add item to adaptor, will be added to list via AddItemAt during OnUpdate() - int insertionPosition = adapter.GetItemCount(); - adapter.InsertData(insertionPosition, itemData); + // Add item to adaptor, will be added to list via AddItemAt during OnUpdate() + int insertionPosition = adapter.GetItemCount(); + adapter.InsertData(insertionPosition, itemData); } /// @@ -420,14 +420,14 @@ namespace Tizen.NUI.Components { dropDownStyle.SelectedItemIndex = -1; } - else if(dropDownStyle.SelectedItemIndex > index) + else if (dropDownStyle.SelectedItemIndex > index) { dropDownStyle.SelectedItemIndex--; } adapter?.RemoveData(index); - if(index < dropDownMenuFullList.ChildCount) + if (index < dropDownMenuFullList.ChildCount) { View childToRemove = dropDownMenuFullList.GetChildAt((uint)index); if (childToRemove) @@ -475,7 +475,7 @@ namespace Tizen.NUI.Components { return; } - Tizen.Log.Error("DropDown","Feature unsupported"); + Tizen.Log.Error("DropDown", "Feature unsupported"); } /// @@ -490,7 +490,7 @@ namespace Tizen.NUI.Components { return; } - Tizen.Log.Error("DropDown","Feature unsupported"); + Tizen.Log.Error("DropDown", "Feature unsupported"); } /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. @@ -623,7 +623,7 @@ namespace Tizen.NUI.Components return new DropDownStyle(); } - private void AddItemAt(DropDownDataItem itemData,int index) + private void AddItemAt(DropDownDataItem itemData, int index) { ViewHolder viewHolder = adapter.OnCreateViewHolder(); if (!viewHolder.IsBound) @@ -701,7 +701,7 @@ namespace Tizen.NUI.Components private View GetViewFromIndex(uint index) { - if ((index < dropDownMenuFullList.ChildCount) && (index >=0) ) + if ((index < dropDownMenuFullList.ChildCount) && (index >= 0)) { return dropDownMenuFullList.GetChildAt(index); } diff --git a/src/Tizen.NUI.Components/Controls/FlexibleView/OrientationHelper.cs b/src/Tizen.NUI.Components/Controls/FlexibleView/OrientationHelper.cs index 20f9059..25df689 100755 --- a/src/Tizen.NUI.Components/Controls/FlexibleView/OrientationHelper.cs +++ b/src/Tizen.NUI.Components/Controls/FlexibleView/OrientationHelper.cs @@ -41,42 +41,42 @@ namespace Tizen.NUI.Components mLayoutManager = layoutManager; } - // Call this method after onLayout method is complete if state is NOT pre-layout. - // This method records information like layout bounds that might be useful in the next layout - // calculations. + // Call this method after onLayout method is complete if state is NOT pre-layout. + // This method records information like layout bounds that might be useful in the next layout + // calculations. public void OnLayoutComplete() { mLastTotalSpace = GetTotalSpace(); } - // Returns the layout space change between the previous layout pass and current layout pass. - // Make sure you call {@link #onLayoutComplete()} at the end of your LayoutManager's - // {@link FlexibleViewRecyclerView.LayoutManager#onLayoutChildren(FlexibleViewRecyclerView.Recycler, - // FlexibleViewRecyclerView.State)} method. - // - // @return The difference between the current total space and previous layout's total space. - // @see #onLayoutComplete() + // Returns the layout space change between the previous layout pass and current layout pass. + // Make sure you call {@link #onLayoutComplete()} at the end of your LayoutManager's + // {@link FlexibleViewRecyclerView.LayoutManager#onLayoutChildren(FlexibleViewRecyclerView.Recycler, + // FlexibleViewRecyclerView.State)} method. + // + // @return The difference between the current total space and previous layout's total space. + // @see #onLayoutComplete() public float GetTotalSpaceChange() { return INVALID_SIZE == mLastTotalSpace ? 0 : GetTotalSpace() - mLastTotalSpace; } - // Returns the start of the view including its decoration and margin. - // For example, for the horizontal helper, if a View's left is at pixel 20, has 2px left - // decoration and 3px left margin, returned value will be 15px. - // - // @param view The view element to check - // @return The first pixel of the element - // @see #getDecoratedEnd(android.view.View) + // Returns the start of the view including its decoration and margin. + // For example, for the horizontal helper, if a View's left is at pixel 20, has 2px left + // decoration and 3px left margin, returned value will be 15px. + // + // @param view The view element to check + // @return The first pixel of the element + // @see #getDecoratedEnd(android.view.View) public abstract float GetViewHolderStart(FlexibleViewViewHolder holder); - // Returns the end of the view including its decoration and margin. - // For example, for the horizontal helper, if a View's right is at pixel 200, has 2px right - // decoration and 3px right margin, returned value will be 205. - // - // @param view The view element to check - // @return The last pixel of the element - // @see #getDecoratedStart(android.view.View) + // Returns the end of the view including its decoration and margin. + // For example, for the horizontal helper, if a View's right is at pixel 200, has 2px right + // decoration and 3px right margin, returned value will be 205. + // + // @param view The view element to check + // @return The last pixel of the element + // @see #getDecoratedStart(android.view.View) public abstract float GetViewHolderEnd(FlexibleViewViewHolder holder); // Returns the space occupied by this View in the current orientation including decorations and @@ -151,7 +151,7 @@ namespace Tizen.NUI.Components { return CreateVerticalHelper(layoutManager); } - + throw new ArgumentException("invalid orientation"); } @@ -166,10 +166,10 @@ namespace Tizen.NUI.Components } - // Creates a vertical OrientationHelper for the given LayoutManager. - // - // @param layoutManager The LayoutManager to attach to. - // @return A new OrientationHelper + // Creates a vertical OrientationHelper for the given LayoutManager. + // + // @param layoutManager The LayoutManager to attach to. + // @return A new OrientationHelper public static OrientationHelper CreateVerticalHelper(FlexibleViewLayoutManager layoutManager) { return new VerticalHelper(layoutManager); @@ -178,7 +178,7 @@ namespace Tizen.NUI.Components internal class HorizontalHelper : OrientationHelper { - public HorizontalHelper(FlexibleViewLayoutManager layoutManager): base(layoutManager) + public HorizontalHelper(FlexibleViewLayoutManager layoutManager) : base(layoutManager) { } diff --git a/src/Tizen.NUI.Components/Controls/ImageScrollBar.cs b/src/Tizen.NUI.Components/Controls/ImageScrollBar.cs index 8962036..d152c7a 100755 --- a/src/Tizen.NUI.Components/Controls/ImageScrollBar.cs +++ b/src/Tizen.NUI.Components/Controls/ImageScrollBar.cs @@ -311,7 +311,7 @@ namespace Tizen.NUI.Components } set { - if(null != Style?.Thumb) + if (null != Style?.Thumb) { Style.Thumb.BackgroundColor = value; RelayoutRequest(); diff --git a/src/Tizen.NUI.Components/Controls/Loading.cs b/src/Tizen.NUI.Components/Controls/Loading.cs index e45a586..ea408c6 100755 --- a/src/Tizen.NUI.Components/Controls/Loading.cs +++ b/src/Tizen.NUI.Components/Controls/Loading.cs @@ -47,16 +47,16 @@ namespace Tizen.NUI.Components }); /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public new static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(Loading), new Size(0,0), propertyChanged: (bindable, oldValue, newValue) => - { - var instance = (Loading)bindable; - if (newValue != null) - { - Size size = (Size)newValue; - ((View)bindable).Size = size; - instance.loadingStyle.LoadingSize = size; - } - }, + public new static readonly BindableProperty SizeProperty = BindableProperty.Create(nameof(Size), typeof(Size), typeof(Loading), new Size(0, 0), propertyChanged: (bindable, oldValue, newValue) => + { + var instance = (Loading)bindable; + if (newValue != null) + { + Size size = (Size)newValue; + ((View)bindable).Size = size; + instance.loadingStyle.LoadingSize = size; + } + }, defaultValueCreator: (bindable) => { var instance = (View)bindable; @@ -64,23 +64,23 @@ namespace Tizen.NUI.Components }); /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static readonly BindableProperty FrameRateProperty = BindableProperty.Create(nameof(FrameRate), typeof(int), typeof(Loading), (int)(1000/16.6f), propertyChanged: (bindable, oldValue, newValue) => - { - var instance = (Loading)bindable; - if (newValue != null) - { - int frameRate = (int)newValue; - if (0 != frameRate) //It will crash if 0 + public static readonly BindableProperty FrameRateProperty = BindableProperty.Create(nameof(FrameRate), typeof(int), typeof(Loading), (int)(1000 / 16.6f), propertyChanged: (bindable, oldValue, newValue) => + { + var instance = (Loading)bindable; + if (newValue != null) + { + int frameRate = (int)newValue; + if (0 != frameRate) //It will crash if 0 { - instance.loadingStyle.FrameRate = frameRate; - instance.imageVisual.FrameDelay = 1000.0f / frameRate; - } - } - }, + instance.loadingStyle.FrameRate = frameRate; + instance.imageVisual.FrameDelay = 1000.0f / frameRate; + } + } + }, defaultValueCreator: (bindable) => { var instance = (Loading)bindable; - return instance.loadingStyle.FrameRate?.All ?? (int)(1000/16.6f); + return instance.loadingStyle.FrameRate?.All ?? (int)(1000 / 16.6f); }); private AnimatedImageVisual imageVisual = null; diff --git a/src/Tizen.NUI.Components/Controls/Navigation/Page.cs b/src/Tizen.NUI.Components/Controls/Navigation/Page.cs index 74ba842..305a87c 100755 --- a/src/Tizen.NUI.Components/Controls/Navigation/Page.cs +++ b/src/Tizen.NUI.Components/Controls/Navigation/Page.cs @@ -76,20 +76,20 @@ namespace Tizen.NUI.Components } set { - if (_content) - { - if (_content != value) - { - Remove(_content); - _content = value; - Add(value); - } - } - else - { - _content = value; - Add(value); - } + if (_content) + { + if (_content != value) + { + Remove(_content); + _content = value; + Add(value); + } + } + else + { + _content = value; + Add(value); + } } } diff --git a/src/Tizen.NUI.Components/Controls/Pagination.cs b/src/Tizen.NUI.Components/Controls/Pagination.cs index 6c863e4..ff4ab1b 100755 --- a/src/Tizen.NUI.Components/Controls/Pagination.cs +++ b/src/Tizen.NUI.Components/Controls/Pagination.cs @@ -25,7 +25,7 @@ namespace Tizen.NUI.Components /// Pagination shows the number of pages available and the currently active page. /// /// 8 - public class Pagination: Control + public class Pagination : Control { private VisualView container; @@ -461,8 +461,8 @@ namespace Tizen.NUI.Components this.Add(container); //TODO: Apply color properties from PaginationStyle class. - indicatorColor = new Color(1.0f, 1.0f, 1.0f, 0.5f); - selectedIndicatorColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); + indicatorColor = new Color(1.0f, 1.0f, 1.0f, 0.5f); + selectedIndicatorColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); } private void CreateIndicator() diff --git a/src/Tizen.NUI.Components/Controls/Popup.cs b/src/Tizen.NUI.Components/Controls/Popup.cs index 87103f7..8c39603 100755 --- a/src/Tizen.NUI.Components/Controls/Popup.cs +++ b/src/Tizen.NUI.Components/Controls/Popup.cs @@ -35,7 +35,7 @@ namespace Tizen.NUI.Components public static readonly BindableProperty ButtonHeightProperty = BindableProperty.Create(nameof(ButtonHeight), typeof(int), typeof(Popup), default(int), propertyChanged: (bindable, oldValue, newValue) => { var instance = (Popup)bindable; - if (newValue != null && instance?.popupStyle?.Buttons?.Size != null ) + if (newValue != null && instance?.popupStyle?.Buttons?.Size != null) { instance.popupStyle.Buttons.Size.Height = (int)newValue; instance.btGroup.Itemheight = (int)newValue; @@ -91,7 +91,7 @@ namespace Tizen.NUI.Components { var instance = (Popup)bindable; if (newValue != null) - { + { if (instance.popupStyle?.Buttons?.Text != null) { instance.popupStyle.Buttons.Text.TextColor = (Color)newValue; @@ -557,7 +557,7 @@ namespace Tizen.NUI.Components public string ButtonFontFamily { get - { + { return (string)GetValue(ButtonFontFamilyProperty); } set @@ -609,7 +609,7 @@ namespace Tizen.NUI.Components public HorizontalAlignment ButtonTextAlignment { get - { + { return (HorizontalAlignment)GetValue(ButtonTextAlignmentProperty); } set @@ -627,7 +627,7 @@ namespace Tizen.NUI.Components public string ButtonBackground { get - { + { return (string)GetValue(ButtonBackgroundProperty); } set @@ -646,7 +646,7 @@ namespace Tizen.NUI.Components { get { - + return (Rectangle)GetValue(ButtonBackgroundBorderProperty); } set @@ -865,7 +865,7 @@ namespace Tizen.NUI.Components titleY = (int)Title.Position.Y; } - if (btGroup.Count != 0 && popupStyle?.Buttons?.Size != null ) + if (btGroup.Count != 0 && popupStyle?.Buttons?.Size != null) { buttonH = (int)popupStyle.Buttons.Size.Height; } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/GridRecycleLayoutManager.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/GridRecycleLayoutManager.cs index b546abc..de3dab6 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/GridRecycleLayoutManager.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/GridRecycleLayoutManager.cs @@ -265,34 +265,34 @@ namespace Tizen.NUI.Components int targetSibling = -1; bool isHorizontal = LayoutOrientation == Orientation.Horizontal; - switch(direction) + switch (direction) { - case View.FocusDirection.Left : - { - targetSibling = isHorizontal ? currentFocusedView.SiblingOrder - 1 : currentFocusedView.SiblingOrder - Rows; - break; - } - case View.FocusDirection.Right : - { - targetSibling = isHorizontal ? currentFocusedView.SiblingOrder + 1 : currentFocusedView.SiblingOrder + Rows; - break; - } - case View.FocusDirection.Up : - { - targetSibling = isHorizontal ? currentFocusedView.SiblingOrder - Columns : currentFocusedView.SiblingOrder - 1; - break; - } - case View.FocusDirection.Down : - { - targetSibling = isHorizontal ? currentFocusedView.SiblingOrder + Columns : currentFocusedView.SiblingOrder + 1; - break; - } + case View.FocusDirection.Left: + { + targetSibling = isHorizontal ? currentFocusedView.SiblingOrder - 1 : currentFocusedView.SiblingOrder - Rows; + break; + } + case View.FocusDirection.Right: + { + targetSibling = isHorizontal ? currentFocusedView.SiblingOrder + 1 : currentFocusedView.SiblingOrder + Rows; + break; + } + case View.FocusDirection.Up: + { + targetSibling = isHorizontal ? currentFocusedView.SiblingOrder - Columns : currentFocusedView.SiblingOrder - 1; + break; + } + case View.FocusDirection.Down: + { + targetSibling = isHorizontal ? currentFocusedView.SiblingOrder + Columns : currentFocusedView.SiblingOrder + 1; + break; + } } - if(targetSibling > -1 && targetSibling < Container.Children.Count) + if (targetSibling > -1 && targetSibling < Container.Children.Count) { RecycleItem candidate = Container.Children[targetSibling] as RecycleItem; - if(candidate != null && candidate.DataIndex >= 0 && candidate.DataIndex < DataCount) + if (candidate != null && candidate.DataIndex >= 0 && candidate.DataIndex < DataCount) { nextFocusedView = candidate; } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/LinearRecycleLayoutManager.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/LinearRecycleLayoutManager.cs index 0c7627e..07107a2 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/LinearRecycleLayoutManager.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/LinearRecycleLayoutManager.cs @@ -40,14 +40,14 @@ namespace Tizen.NUI.Components return result; } - Vector2 visibleArea = new Vector2( Math.Abs(scrollPosition), - Math.Abs(scrollPosition) + (LayoutOrientation == Orientation.Horizontal? - list.Size.Width:list.Size.Height) + Vector2 visibleArea = new Vector2(Math.Abs(scrollPosition), + Math.Abs(scrollPosition) + (LayoutOrientation == Orientation.Horizontal ? + list.Size.Width : list.Size.Height) ); - float firstCheckPoint = LayoutOrientation == Orientation.Horizontal? item.Position.X:item.Position.Y; - float secondCheckPoint = LayoutOrientation == Orientation.Horizontal? - firstCheckPoint + item.Size.Width: + float firstCheckPoint = LayoutOrientation == Orientation.Horizontal ? item.Position.X : item.Position.Y; + float secondCheckPoint = LayoutOrientation == Orientation.Horizontal ? + firstCheckPoint + item.Size.Width : firstCheckPoint + item.Size.Height; // Tizen.Log.Error("NUI", "[1p] "+visibleArea.X+ " =< "+firstCheckPoint+" =< "+visibleArea.Y+" ==== \n"); @@ -71,32 +71,32 @@ namespace Tizen.NUI.Components RecycleItem previousItem = null; - for(int i = 0 ; i < Container.Children.Count ; i++) + for (int i = 0; i < Container.Children.Count; i++) { RecycleItem item = Container.Children[i] as RecycleItem; - if(previousItem != null && item != null) + if (previousItem != null && item != null) { - item.Position = LayoutOrientation == Orientation.Horizontal? + item.Position = LayoutOrientation == Orientation.Horizontal ? new Position( previousItem.Position.X + (previousItem.CurrentSize.Width != 0 ? - previousItem.CurrentSize.Width: + previousItem.CurrentSize.Width : previousItem.Size.Width), item.PositionY - ): + ) : new Position( item.PositionX, - previousItem.Position.Y + (previousItem.CurrentSize.Height != 0 ? - previousItem.CurrentSize.Height: + previousItem.Position.Y + (previousItem.CurrentSize.Height != 0 ? + previousItem.CurrentSize.Height : previousItem.Size.Height) ); } bool isVisible = IsItemVisible(scrollPosition, item); - if(isVisible) + if (isVisible) { - firstVisibleItemIndex = firstVisibleItemIndex == -1? i : firstVisibleItemIndex; + firstVisibleItemIndex = firstVisibleItemIndex == -1 ? i : firstVisibleItemIndex; lastVisibleItemIndex = i; } @@ -105,9 +105,9 @@ namespace Tizen.NUI.Components // Tizen.Log.Error("NUI","["+item.DataIndex+"] "+item.Position.Y+" ==== \n"); } - if(StepSize == 0) + if (StepSize == 0) { - StepSize = LayoutOrientation == Orientation.Horizontal?ItemSize.Width:ItemSize.Height; + StepSize = LayoutOrientation == Orientation.Horizontal ? ItemSize.Width : ItemSize.Height; } } @@ -132,12 +132,12 @@ namespace Tizen.NUI.Components public override List Recycle(float scrollPosition) { List result = new List(); - + bool checkFront = (PrevScrollPosition - scrollPosition) > 0; - if(checkFront) + if (checkFront) { - if(firstVisibleItemIndex > 3) + if (firstVisibleItemIndex > 3) { // Too many item is in front!!! move first item to back!!!! RecycleItem target = Container.Children[0] as RecycleItem; @@ -152,7 +152,7 @@ namespace Tizen.NUI.Components } else { - if(lastVisibleItemIndex < Container.Children.Count - 3) + if (lastVisibleItemIndex < Container.Children.Count - 3) { RecycleItem prevFirstItem = Container.Children[0] as RecycleItem; RecycleItem target = Container.Children[Container.Children.Count - 1] as RecycleItem; @@ -192,34 +192,34 @@ namespace Tizen.NUI.Components int targetSibling = -1; bool isHorizontal = LayoutOrientation == Orientation.Horizontal; - switch(direction) + switch (direction) { - case View.FocusDirection.Left : - { - targetSibling = isHorizontal ? currentFocusedView.SiblingOrder - 1 : targetSibling; - break; - } - case View.FocusDirection.Right : - { - targetSibling = isHorizontal ? currentFocusedView.SiblingOrder + 1 : targetSibling; - break; - } - case View.FocusDirection.Up : - { - targetSibling = isHorizontal ? targetSibling : currentFocusedView.SiblingOrder - 1; - break; - } - case View.FocusDirection.Down : - { - targetSibling = isHorizontal ? targetSibling : currentFocusedView.SiblingOrder + 1; - break; - } + case View.FocusDirection.Left: + { + targetSibling = isHorizontal ? currentFocusedView.SiblingOrder - 1 : targetSibling; + break; + } + case View.FocusDirection.Right: + { + targetSibling = isHorizontal ? currentFocusedView.SiblingOrder + 1 : targetSibling; + break; + } + case View.FocusDirection.Up: + { + targetSibling = isHorizontal ? targetSibling : currentFocusedView.SiblingOrder - 1; + break; + } + case View.FocusDirection.Down: + { + targetSibling = isHorizontal ? targetSibling : currentFocusedView.SiblingOrder + 1; + break; + } } - if(targetSibling > -1 && targetSibling < Container.Children.Count) + if (targetSibling > -1 && targetSibling < Container.Children.Count) { RecycleItem candidate = Container.Children[targetSibling] as RecycleItem; - if(candidate != null && candidate.DataIndex >= 0 && candidate.DataIndex < DataCount) + if (candidate != null && candidate.DataIndex >= 0 && candidate.DataIndex < DataCount) { nextFocusedView = candidate; } diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleAdapter.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleAdapter.cs old mode 100644 new mode 100755 index 49e229c..3acbf25 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleAdapter.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleAdapter.cs @@ -82,7 +82,8 @@ namespace Tizen.NUI.Components /// 8 /// This may be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API [EditorBrowsable(EditorBrowsableState.Never)] - public List Data{ + public List Data + { get { return mData; diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleLayoutManager.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleLayoutManager.cs old mode 100644 new mode 100755 index 6a946e2..6105314 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleLayoutManager.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/RecycleLayoutManager.cs @@ -58,23 +58,23 @@ namespace Tizen.NUI.Components /// 8 /// This may be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API [EditorBrowsable(EditorBrowsableState.Never)] - public View Container{get;set;} - + public View Container { get; set; } + /// /// Size of RecycleItem. /// /// 8 /// This may be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API [EditorBrowsable(EditorBrowsableState.Never)] - public Size ItemSize{get;set;} = new Size(); - + public Size ItemSize { get; set; } = new Size(); + /// /// Get/Set the orientation in the layout. /// /// 8 /// This may be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API [EditorBrowsable(EditorBrowsableState.Never)] - public Orientation LayoutOrientation{get;set;} = Orientation.Vertical; + public Orientation LayoutOrientation { get; set; } = Orientation.Vertical; /// /// How far can you reach the next item. @@ -90,7 +90,7 @@ namespace Tizen.NUI.Components /// 8 /// This may be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API [EditorBrowsable(EditorBrowsableState.Never)] - public int DataCount{get; set;} + public int DataCount { get; set; } /// /// The last scrolled position which is calculated by ScrollableBase. The value should be updated in the Recycle() method. @@ -108,7 +108,7 @@ namespace Tizen.NUI.Components [EditorBrowsable(EditorBrowsableState.Never)] public virtual void Layout(float scrollPosition) { - + } /// diff --git a/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs b/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs index 2f3daab..0e9444c 100755 --- a/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs +++ b/src/Tizen.NUI.Components/Controls/RecyclerView/RecyclerView.cs @@ -275,7 +275,7 @@ namespace Tizen.NUI.Components if (LayoutManager != null) { nextFocusedView = LayoutManager.RequestNextFocusableView(currentFocusedView, direction, loopEnabled); - } + } } if (nextFocusedView) @@ -323,7 +323,7 @@ namespace Tizen.NUI.Components { prevFocusedDataIndex = (nextFocusedView as RecycleItem).DataIndex; } - + ScrollTo(targetPosition, true); } else @@ -333,28 +333,28 @@ namespace Tizen.NUI.Components switch (direction) { case View.FocusDirection.Left: - { - nextFocusedView = LeftFocusableView; - break; - } + { + nextFocusedView = LeftFocusableView; + break; + } case View.FocusDirection.Right: - { - nextFocusedView = RightFocusableView; - break; - } + { + nextFocusedView = RightFocusableView; + break; + } case View.FocusDirection.Up: - { - nextFocusedView = UpFocusableView; - break; - } + { + nextFocusedView = UpFocusableView; + break; + } case View.FocusDirection.Down: - { - nextFocusedView = DownFocusableView; - break; - } + { + nextFocusedView = DownFocusableView; + break; + } } - if(nextFocusedView) + if (nextFocusedView) { focusedView = null; } diff --git a/src/Tizen.NUI.Components/Controls/Scrollbar.cs b/src/Tizen.NUI.Components/Controls/Scrollbar.cs index 1765fd9..ffa7417 100755 --- a/src/Tizen.NUI.Components/Controls/Scrollbar.cs +++ b/src/Tizen.NUI.Components/Controls/Scrollbar.cs @@ -501,7 +501,7 @@ namespace Tizen.NUI.Components return; } - trackVisual.Size = calculator.CalculateTrackSize(TrackThickness, containerSize, trackPadding); + trackVisual.Size = calculator.CalculateTrackSize(TrackThickness, containerSize, trackPadding); trackVisual.Position = calculator.CalculateTrackPosition(trackPadding); thumbVisual.Size = calculator.CalculateThumbSize(ThumbThickness, trackVisual.Size); thumbVisual.Position = calculator.CalculateThumbPaddingPosition(trackVisual.Size, thumbVisual.Size, thumbVisual.Position, trackPadding); @@ -634,12 +634,12 @@ namespace Tizen.NUI.Components public override Size CalculateTrackSize(float thickness, Size containerSize, Extents trackPadding) { - return new Size(containerSize.Width - trackPadding?.Start??0 - trackPadding?.End??0, thickness); + return new Size(containerSize.Width - trackPadding?.Start ?? 0 - trackPadding?.End ?? 0, thickness); } public override Vector2 CalculateTrackPosition(Extents trackPadding) { - return new Vector2(0, -trackPadding?.Bottom??0); + return new Vector2(0, -trackPadding?.Bottom ?? 0); } public override Size CalculateThumbSize(float thickness, Size trackSize) @@ -649,21 +649,21 @@ namespace Tizen.NUI.Components public override Vector2 CalculateThumbPosition(Size trackSize, Size thumbSize, Extents trackPadding) { - float padding = ((trackSize.Height - thumbSize.Height) / 2.0f) + trackPadding?.Bottom??0; + float padding = ((trackSize.Height - thumbSize.Height) / 2.0f) + trackPadding?.Bottom ?? 0; float pos = Math.Min(Math.Max(currentPosition, 0.0f), contentLength - visibleLength); - return new Vector2(trackPadding?.Start??0 + trackSize.Width * pos / contentLength, -padding); + return new Vector2(trackPadding?.Start ?? 0 + trackSize.Width * pos / contentLength, -padding); } public override Vector2 CalculateThumbPaddingPosition(Size trackSize, Size thumbSize, Vector2 thumbCurrentPosition, Extents trackPadding) { - float padding = ((trackSize.Height - thumbSize.Height) / 2.0f) + trackPadding?.Bottom??0; + float padding = ((trackSize.Height - thumbSize.Height) / 2.0f) + trackPadding?.Bottom ?? 0; return new Vector2(thumbCurrentPosition.X, -padding); } public override Vector2 CalculateThumbScrollPosition(Size trackSize, Vector2 thumbCurrentPosition, Extents trackPadding) { float pos = Math.Min(Math.Max(currentPosition, 0.0f), contentLength - visibleLength); - return new Vector2(trackPadding?.Start??0 + trackSize.Width * pos / contentLength, thumbCurrentPosition.Y); + return new Vector2(trackPadding?.Start ?? 0 + trackSize.Width * pos / contentLength, thumbCurrentPosition.Y); } } @@ -685,12 +685,12 @@ namespace Tizen.NUI.Components public override Size CalculateTrackSize(float thickness, Size containerSize, Extents trackPadding) { - return new Size(thickness, containerSize.Height - trackPadding?.Top??0 - trackPadding?.Bottom??0); + return new Size(thickness, containerSize.Height - trackPadding?.Top ?? 0 - trackPadding?.Bottom ?? 0); } public override Vector2 CalculateTrackPosition(Extents trackPadding) { - return new Vector2(-trackPadding?.End??0, 0); + return new Vector2(-trackPadding?.End ?? 0, 0); } public override Size CalculateThumbSize(float thickness, Size trackSize) @@ -700,21 +700,21 @@ namespace Tizen.NUI.Components public override Vector2 CalculateThumbPosition(Size trackSize, Size thumbSize, Extents trackPadding) { - float padding = ((trackSize.Width - thumbSize.Width) / 2.0f) + trackPadding?.End??0; + float padding = ((trackSize.Width - thumbSize.Width) / 2.0f) + trackPadding?.End ?? 0; float pos = Math.Min(Math.Max(currentPosition, 0.0f), contentLength - visibleLength); - return new Vector2(-padding, trackPadding?.Top??0 + trackSize.Height * pos / contentLength); + return new Vector2(-padding, trackPadding?.Top ?? 0 + trackSize.Height * pos / contentLength); } public override Vector2 CalculateThumbPaddingPosition(Size trackSize, Size thumbSize, Vector2 thumbCurrentPosition, Extents trackPadding) { - float padding = ((trackSize.Width - thumbSize.Width) / 2.0f) + trackPadding?.End??0; + float padding = ((trackSize.Width - thumbSize.Width) / 2.0f) + trackPadding?.End ?? 0; return new Vector2(-padding, thumbCurrentPosition.Y); } public override Vector2 CalculateThumbScrollPosition(Size trackSize, Vector2 thumbPosition, Extents trackPadding) { float pos = Math.Min(Math.Max(currentPosition, 0.0f), contentLength - visibleLength); - return new Vector2(thumbPosition.X, trackPadding?.Top??0 + trackSize.Height * pos / contentLength); + return new Vector2(thumbPosition.X, trackPadding?.Top ?? 0 + trackSize.Height * pos / contentLength); } } diff --git a/src/Tizen.NUI.Components/Controls/SelectButton.cs b/src/Tizen.NUI.Components/Controls/SelectButton.cs index 07a0e21..ccd46e0 100755 --- a/src/Tizen.NUI.Components/Controls/SelectButton.cs +++ b/src/Tizen.NUI.Components/Controls/SelectButton.cs @@ -201,7 +201,7 @@ namespace Tizen.NUI.Components } private void OnSelect() - { + { OnSelectedChanged(); if (SelectedChanged != null) diff --git a/src/Tizen.NUI.Components/Controls/Slider.cs b/src/Tizen.NUI.Components/Controls/Slider.cs index a144d3d..83b8483 100755 --- a/src/Tizen.NUI.Components/Controls/Slider.cs +++ b/src/Tizen.NUI.Components/Controls/Slider.cs @@ -118,7 +118,7 @@ namespace Tizen.NUI.Components /// The constructor of the Slider class. /// /// 6 - public Slider() + public Slider() { Initialize(); } @@ -589,8 +589,8 @@ namespace Tizen.NUI.Components { if (null != lowIndicatorText) { - lowIndicatorText.Text= value; - sliderStyle.LowIndicator.Text= value; + lowIndicatorText.Text = value; + sliderStyle.LowIndicator.Text = value; } } } @@ -954,7 +954,7 @@ namespace Tizen.NUI.Components slidingFinishedHandler(this, args); } - if (null !=sliderSlidingFinishedHandler) + if (null != sliderSlidingFinishedHandler) { SliderSlidingFinishedEventArgs args = new SliderSlidingFinishedEventArgs(); args.CurrentValue = curValue; diff --git a/src/Tizen.NUI.Components/Controls/Tab.cs b/src/Tizen.NUI.Components/Controls/Tab.cs index df33271..6872689 100755 --- a/src/Tizen.NUI.Components/Controls/Tab.cs +++ b/src/Tizen.NUI.Components/Controls/Tab.cs @@ -213,7 +213,7 @@ namespace Tizen.NUI.Components } set { - if(null != value && null != tabStyle?.ItemPadding) + if (null != value && null != tabStyle?.ItemPadding) { tabStyle.ItemPadding.CopyFrom(value); @@ -317,7 +317,7 @@ namespace Tizen.NUI.Components if (null != tabStyle?.Text) { tabStyle.Text.FontFamily = value; - RelayoutRequest(); + RelayoutRequest(); } } } @@ -338,7 +338,7 @@ namespace Tizen.NUI.Components if (null != tabStyle?.Text) { tabStyle.Text.TextColor = value; - RelayoutRequest(); + RelayoutRequest(); } } } @@ -400,7 +400,7 @@ namespace Tizen.NUI.Components [Obsolete("Deprecated in API8; Will be removed in API10")] public void DeleteItem(int itemIndex) { - if(itemList == null || itemIndex < 0 || itemIndex >= itemList.Count) + if (itemList == null || itemIndex < 0 || itemIndex >= itemList.Count) { return; } @@ -450,9 +450,9 @@ namespace Tizen.NUI.Components if (type == DisposeTypes.Explicit) { - if(underlineAni != null) + if (underlineAni != null) { - if(underlineAni.State == Animation.States.Playing) + if (underlineAni.State == Animation.States.Playing) { underlineAni.Stop(); } @@ -460,9 +460,9 @@ namespace Tizen.NUI.Components underlineAni = null; } Utility.Dispose(underline); - if(itemList != null) + if (itemList != null) { - for(int i = 0; i < itemList.Count; i++) + for (int i = 0; i < itemList.Count; i++) { Remove(itemList[i]); itemList[i].Dispose(); @@ -640,7 +640,7 @@ namespace Tizen.NUI.Components underlineAni = new Animation(aniTime); } } - + private void UpdateUnderLinePos() { if (underline == null || Underline.Size == null || itemList == null || itemList.Count <= 0) @@ -674,7 +674,7 @@ namespace Tizen.NUI.Components private void UpdateSelectedItem(TabItem item) { - if(item == null || curIndex == item.Index) + if (item == null || curIndex == item.Index) { return; } @@ -696,7 +696,7 @@ namespace Tizen.NUI.Components private bool ItemTouchEvent(object source, TouchEventArgs e) { TabItem item = source as TabItem; - if(item == null) + if (item == null) { return false; } diff --git a/src/Tizen.NUI.Components/Controls/Toast.cs b/src/Tizen.NUI.Components/Controls/Toast.cs index e861c49..58d09be 100755 --- a/src/Tizen.NUI.Components/Controls/Toast.cs +++ b/src/Tizen.NUI.Components/Controls/Toast.cs @@ -73,7 +73,7 @@ namespace Tizen.NUI.Components /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static Toast FromText(string text, uint duration) + public static Toast FromText(string text, uint duration) { Toast toast = new Toast(); toast.Message = text; diff --git a/src/Tizen.NUI.Components/PreloadStyle/OverlayAnimationButtonStyle.cs b/src/Tizen.NUI.Components/PreloadStyle/OverlayAnimationButtonStyle.cs index 76598c9..ed5cc94 100755 --- a/src/Tizen.NUI.Components/PreloadStyle/OverlayAnimationButtonStyle.cs +++ b/src/Tizen.NUI.Components/PreloadStyle/OverlayAnimationButtonStyle.cs @@ -164,11 +164,11 @@ namespace Tizen.NUI.Components } if (PressAnimation.State == Animation.States.Playing) - { - PressAnimation.Stop(); - } - PressAnimation.Dispose(); - PressAnimation = null; + { + PressAnimation.Stop(); + } + PressAnimation.Dispose(); + PressAnimation = null; } } } diff --git a/src/Tizen.NUI.Components/Style/ButtonStyle.cs b/src/Tizen.NUI.Components/Style/ButtonStyle.cs index eb9c444..a653084 100755 --- a/src/Tizen.NUI.Components/Style/ButtonStyle.cs +++ b/src/Tizen.NUI.Components/Style/ButtonStyle.cs @@ -198,7 +198,7 @@ namespace Tizen.NUI.Components /// 8 public Extents TextPadding { - get => ((Extents)GetValue(TextPaddingProperty)) ?? (textPadding = new Extents()); + get => ((Extents)GetValue(TextPaddingProperty)) ?? (textPadding = new Extents()); set => SetValue(TextPaddingProperty, value); } diff --git a/src/Tizen.NUI.Components/Style/ControlStyle.cs b/src/Tizen.NUI.Components/Style/ControlStyle.cs index 44cc34e..8e215fe 100755 --- a/src/Tizen.NUI.Components/Style/ControlStyle.cs +++ b/src/Tizen.NUI.Components/Style/ControlStyle.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI.Components private bool isDisposeQueued = false; - static ControlStyle () { } + static ControlStyle() { } /// /// Creates a new instance of a ControlStyle. diff --git a/src/Tizen.NUI.Components/Utils/StyleManager.cs b/src/Tizen.NUI.Components/Utils/StyleManager.cs index d1ebc4e..f1ddb1c 100755 --- a/src/Tizen.NUI.Components/Utils/StyleManager.cs +++ b/src/Tizen.NUI.Components/Utils/StyleManager.cs @@ -172,7 +172,7 @@ namespace Tizen.NUI.Components if (Activator.CreateInstance(style) as StyleBase != null) { ThemeMap[key].AddStyleWithoutClone(component.FullName, (Activator.CreateInstance(style) as StyleBase).GetViewStyle()); - } + } } /// diff --git a/src/Tizen.NUI.Components/Utils/Utility.cs b/src/Tizen.NUI.Components/Utils/Utility.cs index 5e521ab..ec704ec 100755 --- a/src/Tizen.NUI.Components/Utils/Utility.cs +++ b/src/Tizen.NUI.Components/Utils/Utility.cs @@ -25,12 +25,12 @@ namespace Tizen.NUI.Components public static void Dispose(View child) { View parent = child?.GetParent() as View; - if(child != null) + if (child != null) { - if(parent != null) + if (parent != null) { parent.Remove(child); - + } child.Dispose(); diff --git a/src/Tizen.NUI/src/internal/Alignment.cs b/src/Tizen.NUI/src/internal/Alignment.cs index f37c9b4..a59715d 100755 --- a/src/Tizen.NUI/src/internal/Alignment.cs +++ b/src/Tizen.NUI/src/internal/Alignment.cs @@ -49,7 +49,7 @@ namespace Tizen.NUI { return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - + /// 3 protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr) { diff --git a/src/Tizen.NUI/src/internal/Application.cs b/src/Tizen.NUI/src/internal/Application.cs index 498553a..492c27c 100755 --- a/src/Tizen.NUI/src/internal/Application.cs +++ b/src/Tizen.NUI/src/internal/Application.cs @@ -1090,7 +1090,7 @@ namespace Tizen.NUI { // register all Views with the type registry, so that can be created / styled via JSON //ViewRegistryHelper.Initialize(); //moved to Application side. - if(_instance) + if (_instance) { return _instance; } @@ -1293,7 +1293,7 @@ namespace Tizen.NUI public Window GetWindow() { Window ret = Registry.GetManagedBaseHandleFromNativePtr(Interop.Application.Application_GetWindow(swigCPtr)) as Window; - if(ret == null) + if (ret == null) { ret = new Window(Interop.Application.Application_GetWindow(swigCPtr), true); } @@ -1330,11 +1330,11 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); List WindowList = new List(); - for( uint i = 0; i < ListSize; ++i ) + for (uint i = 0; i < ListSize; ++i) { Window currWin = Registry.GetManagedBaseHandleFromNativePtr(Interop.Application.Application_GetWindowsFromList(i)) as Window; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - if(currWin) + if (currWin) { WindowList.Add(currWin); } diff --git a/src/Tizen.NUI/src/internal/BackKeyManager.cs b/src/Tizen.NUI/src/internal/BackKeyManager.cs index 8633678..21cfbb9 100755 --- a/src/Tizen.NUI/src/internal/BackKeyManager.cs +++ b/src/Tizen.NUI/src/internal/BackKeyManager.cs @@ -41,7 +41,7 @@ namespace Tizen.NUI /// Subscriber. /// [EditorBrowsable(EditorBrowsableState.Never)] - public List Subscriber{get; set;} = new List(); + public List Subscriber { get; set; } = new List(); /// /// BackKeyManager static instance. @@ -69,17 +69,17 @@ namespace Tizen.NUI Container parent1 = comparison1?.GetParent(); Container parent2 = comparison2?.GetParent(); - if((parent1 == null && parent2 != null) || (parent2 == null && parent1 != null)) + if ((parent1 == null && parent2 != null) || (parent2 == null && parent1 != null)) { // One is in DefaultLayer but the other is not - if(parent2 == null) + if (parent2 == null) { // parent1 is in DefaultLayer. Layer comparison2AsLayer = comparison2 as Layer; - if(comparison2AsLayer != null) + if (comparison2AsLayer != null) { result = comparison2AsLayer.Depth > NUIApplication.GetDefaultWindow().GetDefaultLayer().Depth; - } + } } else { @@ -94,10 +94,10 @@ namespace Tizen.NUI else { // If they have same parent, ready to compare! - if(parent1 == parent2) + if (parent1 == parent2) { - if(comparison1.GetType().FullName.Contains("Layer")) + if (comparison1.GetType().FullName.Contains("Layer")) { // If comparison1 is Layer, comparison2 is also Layer because only window can have Layer as child in NUI. // Compare Depth @@ -106,7 +106,7 @@ namespace Tizen.NUI if (comparison1AsLayer != null && comparison2AsLayer != null) { result = comparison1AsLayer.Depth < comparison2AsLayer.Depth; - } + } } else { @@ -117,7 +117,7 @@ namespace Tizen.NUI if (comparison1AsView != null && comparison2AsView != null) { result = comparison1AsView.SiblingOrder < comparison2AsView.SiblingOrder; - } + } } } else @@ -132,30 +132,30 @@ namespace Tizen.NUI private void OnWindowKeyEvent(object source, Window.KeyEventArgs args) { - if(args.Key.State == Key.StateType.Up && (args.Key.KeyPressedName == "Back" || args.Key.KeyPressedName == "XF86Back")) + if (args.Key.State == Key.StateType.Up && (args.Key.KeyPressedName == "Back" || args.Key.KeyPressedName == "XF86Back")) { View top = null; for (int i = 0; i < Subscriber.Count; i++) { // Check visibility - if(Subscriber[i].Visibility && Subscriber[i].IsOnWindow) + if (Subscriber[i].Visibility && Subscriber[i].IsOnWindow) { // Initialize first top - if(top == null) + if (top == null) { top = Subscriber[i]; continue; } else { - if(top.HierarchyDepth != Subscriber[i].HierarchyDepth) + if (top.HierarchyDepth != Subscriber[i].HierarchyDepth) { Container compare1 = top; Container compare2 = Subscriber[i]; // If their depth is different, sync. - if(top.HierarchyDepth > Subscriber[i].HierarchyDepth) + if (top.HierarchyDepth > Subscriber[i].HierarchyDepth) { compare1 = FindParent(compare1, top.HierarchyDepth - Subscriber[i].HierarchyDepth); } @@ -164,10 +164,10 @@ namespace Tizen.NUI compare2 = FindParent(compare2, Subscriber[i].HierarchyDepth - top.HierarchyDepth); } - if(compare1 == compare2) + if (compare1 == compare2) { // One is descendant of the other. Descendant is above ancestor. - top = top.HierarchyDepth > Subscriber[i].HierarchyDepth? top : Subscriber[i]; + top = top.HierarchyDepth > Subscriber[i].HierarchyDepth ? top : Subscriber[i]; } else { diff --git a/src/Tizen.NUI/src/internal/CustomActor.cs b/src/Tizen.NUI/src/internal/CustomActor.cs index 7a7034a..5b48224 100755 --- a/src/Tizen.NUI/src/internal/CustomActor.cs +++ b/src/Tizen.NUI/src/internal/CustomActor.cs @@ -41,7 +41,7 @@ namespace Tizen.NUI public static CustomActor DownCast(BaseHandle handle) { - CustomActor ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as CustomActor; + CustomActor ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as CustomActor; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs index 8d14c2e..a66f6b7 100755 --- a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs +++ b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs @@ -80,7 +80,7 @@ namespace Tizen.NUI } catch (global::System.Exception ex) { - Tizen.Log.Error("NUI","Registry Error: "+ ex); + Tizen.Log.Error("NUI", "Registry Error: " + ex); } return global::System.IntPtr.Zero; } diff --git a/src/Tizen.NUI/src/internal/DisposeQueue.cs b/src/Tizen.NUI/src/internal/DisposeQueue.cs index b69ed23..917ee28 100755 --- a/src/Tizen.NUI/src/internal/DisposeQueue.cs +++ b/src/Tizen.NUI/src/internal/DisposeQueue.cs @@ -36,10 +36,10 @@ namespace Tizen.NUI private bool _isCalled = false; public void Initialize() { - if(_isCalled == false) + if (_isCalled == false) { - _disposeQueueProcessDisposablesDelegate = new EventThreadCallback.CallbackDelegate(ProcessDisposables); - _eventThreadCallback = new EventThreadCallback(_disposeQueueProcessDisposablesDelegate); + _disposeQueueProcessDisposablesDelegate = new EventThreadCallback.CallbackDelegate(ProcessDisposables); + _eventThreadCallback = new EventThreadCallback(_disposeQueueProcessDisposablesDelegate); _isCalled = true; } } diff --git a/src/Tizen.NUI/src/internal/EnvironmentVariable.cs b/src/Tizen.NUI/src/internal/EnvironmentVariable.cs index 60da5c7..017d6df 100755 --- a/src/Tizen.NUI/src/internal/EnvironmentVariable.cs +++ b/src/Tizen.NUI/src/internal/EnvironmentVariable.cs @@ -27,7 +27,7 @@ namespace Tizen.NUI { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GetEnvironmentVariable")] private static extern string EnvironmentVariable_GetEnvironmentVariable(string jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_SetEnvironmentVariable")] private static extern bool EnvironmentVariable_SetEnvironmentVariable(string jarg1, string jarg2); diff --git a/src/Tizen.NUI/src/internal/Extensions.cs b/src/Tizen.NUI/src/internal/Extensions.cs index 5a7235f..7a3b29b 100755 --- a/src/Tizen.NUI/src/internal/Extensions.cs +++ b/src/Tizen.NUI/src/internal/Extensions.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI return ret; } - public static string GetValueString(this PropertyInfo property, object obj, Type propertyType) + public static string GetValueString(this PropertyInfo property, object obj, Type propertyType) { string ret = ""; object value = property.GetValue(obj); diff --git a/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs b/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs index 7aeac65..d6b036a 100755 --- a/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs +++ b/src/Tizen.NUI/src/internal/FrameBroker/DefaultFrameBroker.cs @@ -40,7 +40,7 @@ namespace Tizen.NUI protected override void OnFrameResumed(FrameData frame) { - if(isAnimating) + if (isAnimating) { return; } @@ -86,8 +86,8 @@ namespace Tizen.NUI private TransitionAnimation forwardAnimation; - internal TransitionAnimation ForwardAnimation - { + internal TransitionAnimation ForwardAnimation + { get { return forwardAnimation; @@ -103,7 +103,7 @@ namespace Tizen.NUI internal TransitionAnimation BackwardAnimation { get - { + { return backwardAnimation; } set diff --git a/src/Tizen.NUI/src/internal/FriendAssembly.cs b/src/Tizen.NUI/src/internal/FriendAssembly.cs index da5141f..6ca5163 100755 --- a/src/Tizen.NUI/src/internal/FriendAssembly.cs +++ b/src/Tizen.NUI/src/internal/FriendAssembly.cs @@ -18,7 +18,7 @@ // friend assembly setting // compile with: /target:Tizen.NUI.ExtTEST /keyfile:FriendAssemblies.snk -using System; +using System; using System.Collections.Generic; using System.Text; @@ -38,7 +38,8 @@ using System.Runtime.CompilerServices; [assembly: InternalsVisibleTo("NuiSample, " + Tizen.NUI.PublicKey.Sample)] -namespace Tizen.NUI { +namespace Tizen.NUI +{ internal static class PublicKey { diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Animation.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Animation.cs index dfc9353..08fb282 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Animation.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Animation.cs @@ -203,7 +203,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_AnimationSignal")] public static extern void delete_AnimationSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Animation_SWIGUpcast")] public static extern global::System.IntPtr Animation_SWIGUpcast(global::System.IntPtr jarg1); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.BaseObject.cs b/src/Tizen.NUI/src/internal/Interop/Interop.BaseObject.cs index 113a04a..2d3ec7d 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.BaseObject.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.BaseObject.cs @@ -7,7 +7,7 @@ namespace Tizen.NUI internal static partial class Interop { internal static partial class BaseObject - { + { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_BaseObject_DoAction")] public static extern bool BaseObject_DoAction(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, global::System.Runtime.InteropServices.HandleRef jarg3); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.CameraActor.cs b/src/Tizen.NUI/src/internal/Interop/Interop.CameraActor.cs index 458d4e9..1a8767f 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.CameraActor.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.CameraActor.cs @@ -133,7 +133,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CameraActor_SetOrthographicProjection__SWIG_1")] public static extern void CameraActor_SetOrthographicProjection__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3, float jarg4, float jarg5, float jarg6, float jarg7); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_CameraActor_SWIGUpcast")] public static extern global::System.IntPtr CameraActor_SWIGUpcast(global::System.IntPtr jarg1); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Capture.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Capture.cs index f51a3d4..d5ea812 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Capture.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Capture.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Capture_Start_4")] public static extern void Start4(HandleRef capture, HandleRef source, HandleRef position, HandleRef size, string path, HandleRef clearColor); - + [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Capture_SetImageQuality")] public static extern void SetImageQuality(HandleRef capture, uint quality); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ComponentApplication.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ComponentApplication.cs index dab1716..de49855 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ComponentApplication.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ComponentApplication.cs @@ -13,7 +13,7 @@ * See the License for the specific language governing permissions and * limitations under the License. */ - + using System; using System.Collections.Generic; using System.Text; @@ -24,27 +24,27 @@ namespace Tizen.NUI { internal static partial class ComponentApplication { - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_ComponentApplication")] - public static extern global::System.IntPtr ComponentApplication_New(int argc, string argv, string styleSheet); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_ComponentApplication_SWIG1")] - public static extern global::System.IntPtr new_ComponentApplication__SWIG_1(global::System.Runtime.InteropServices.HandleRef swigCPtr); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_assign_ComponentApplication")] - public static extern global::System.IntPtr ComponentApplication_Assign(global::System.Runtime.InteropServices.HandleRef swigCPtr, global::System.Runtime.InteropServices.HandleRef swigCPtr2); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_ComponentApplication")] - public static extern global::System.IntPtr delete_ComponentApplication(global::System.Runtime.InteropServices.HandleRef swigCPtr); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ComponentApplication_CreateNativeSignal")] - public static extern global::System.IntPtr ComponentApplication_CreateNativeSignal(global::System.Runtime.InteropServices.HandleRef swigCPtr); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ComponentApplication_CreateNativeSignal_Connect")] - public static extern global::System.IntPtr ComponentApplication_CreateNativeSignal_Connect(global::System.Runtime.InteropServices.HandleRef swigCPtr, global::System.Runtime.InteropServices.HandleRef func); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ComponentApplication_CreateNativeSignal_Disconnect")] - public static extern global::System.IntPtr ComponentApplication_CreateNativeSignal_Disconnect(global::System.Runtime.InteropServices.HandleRef swigCPtr, global::System.Runtime.InteropServices.HandleRef func); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_ComponentApplication")] + public static extern global::System.IntPtr ComponentApplication_New(int argc, string argv, string styleSheet); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_ComponentApplication_SWIG1")] + public static extern global::System.IntPtr new_ComponentApplication__SWIG_1(global::System.Runtime.InteropServices.HandleRef swigCPtr); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_assign_ComponentApplication")] + public static extern global::System.IntPtr ComponentApplication_Assign(global::System.Runtime.InteropServices.HandleRef swigCPtr, global::System.Runtime.InteropServices.HandleRef swigCPtr2); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_ComponentApplication")] + public static extern global::System.IntPtr delete_ComponentApplication(global::System.Runtime.InteropServices.HandleRef swigCPtr); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ComponentApplication_CreateNativeSignal")] + public static extern global::System.IntPtr ComponentApplication_CreateNativeSignal(global::System.Runtime.InteropServices.HandleRef swigCPtr); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ComponentApplication_CreateNativeSignal_Connect")] + public static extern global::System.IntPtr ComponentApplication_CreateNativeSignal_Connect(global::System.Runtime.InteropServices.HandleRef swigCPtr, global::System.Runtime.InteropServices.HandleRef func); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ComponentApplication_CreateNativeSignal_Disconnect")] + public static extern global::System.IntPtr ComponentApplication_CreateNativeSignal_Disconnect(global::System.Runtime.InteropServices.HandleRef swigCPtr, global::System.Runtime.InteropServices.HandleRef func); } } } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.GLWindow.cs b/src/Tizen.NUI/src/internal/Interop/Interop.GLWindow.cs old mode 100644 new mode 100755 index c6831b6..205e8b7 --- a/src/Tizen.NUI/src/internal/Interop/Interop.GLWindow.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.GLWindow.cs @@ -13,7 +13,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr GlWindow_New__SWIG_0(); [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GlWindow_New__SWIG_1")] - public static extern global::System.IntPtr GlWindow_New__SWIG_1(HandleRef jarg1, string jarg2, string jarg3, bool jarg4 ); + public static extern global::System.IntPtr GlWindow_New__SWIG_1(HandleRef jarg1, string jarg2, string jarg3, bool jarg4); [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_GlWindow__SWIG_0")] public static extern global::System.IntPtr new_GlWindow__SWIG_0(); @@ -91,7 +91,7 @@ namespace Tizen.NUI public static extern void GlWindow_SetPreferredOrientation(HandleRef jarg1, int jarg2); [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GlWindow_RegisterGlCallback")] - public static extern void GlWindow_RegisterGlCallback(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); + public static extern void GlWindow_RegisterGlCallback(HandleRef jarg1, HandleRef jarg2, HandleRef jarg3, HandleRef jarg4); [DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GlWindow_RenderOnce")] public static extern void GlWindow_RenderOnce(HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Geometry.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Geometry.cs index 4105d87..720577c 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Geometry.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Geometry.cs @@ -39,7 +39,7 @@ namespace Tizen.NUI public static extern void Geometry_RemoveVertexBuffer(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Geometry_SetIndexBuffer")] - public static extern void Geometry_SetIndexBuffer(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]ushort[] jarg2, uint jarg3); + public static extern void Geometry_SetIndexBuffer(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] ushort[] jarg2, uint jarg3); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Geometry_SetType")] public static extern void Geometry_SetType(global::System.Runtime.InteropServices.HandleRef jarg1, int jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.GestureDetector.cs b/src/Tizen.NUI/src/internal/Interop/Interop.GestureDetector.cs index f35efa9..00807bb 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.GestureDetector.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.GestureDetector.cs @@ -39,7 +39,7 @@ namespace Tizen.NUI public static extern uint GestureDetector_GetAttachedActorCount(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GestureDetector_GetAttachedActor")] - public static extern global::System.IntPtr GestureDetector_GetAttachedActor(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); + public static extern global::System.IntPtr GestureDetector_GetAttachedActor(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.GlyphInfo.cs b/src/Tizen.NUI/src/internal/Interop/Interop.GlyphInfo.cs index 915ee19..c6fd356 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.GlyphInfo.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.GlyphInfo.cs @@ -63,7 +63,7 @@ namespace Tizen.NUI public static extern float GlyphInfo_scaleFactor_get(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_GlyphInfo")] - public static extern void delete_GlyphInfo(global::System.Runtime.InteropServices.HandleRef jarg1); + public static extern void delete_GlyphInfo(global::System.Runtime.InteropServices.HandleRef jarg1); } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Matrix.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Matrix.cs index 24c07f1..d6069d4 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Matrix.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Matrix.cs @@ -15,7 +15,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr new_Matrix__SWIG_1(bool jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Matrix__SWIG_2")] - public static extern global::System.IntPtr new_Matrix__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg1); + public static extern global::System.IntPtr new_Matrix__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Matrix__SWIG_3")] public static extern global::System.IntPtr new_Matrix__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Model3DView.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Model3DView.cs index 527b8fc..827e1b9 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Model3DView.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Model3DView.cs @@ -58,7 +58,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Model3dView_DownCast")] public static extern global::System.IntPtr Model3dView_DownCast(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Model3dView_SWIGUpcast")] public static extern global::System.IntPtr Model3dView_SWIGUpcast(global::System.IntPtr jarg1); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.NDalic.cs b/src/Tizen.NUI/src/internal/Interop/Interop.NDalic.cs index 5d2d38a..5ab5377 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.NDalic.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.NDalic.cs @@ -127,7 +127,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_LowerBelow")] public static extern void LowerBelow(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GetImplementation__SWIG_0")] public static extern global::System.IntPtr GetImplementation__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -136,157 +136,157 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_SetCustomAlgorithm")] public static extern void SetCustomAlgorithm(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_EqualTo__SWIG_5")] public static extern bool EqualTo__SWIG_5(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_NotEqualTo__SWIG_4")] public static extern bool NotEqualTo__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Clamp__SWIG_3")] public static extern global::System.IntPtr Clamp__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_EqualTo__SWIG_6")] public static extern bool EqualTo__SWIG_6(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_NotEqualTo__SWIG_5")] public static extern bool NotEqualTo__SWIG_5(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_EqualTo__SWIG_7")] public static extern bool EqualTo__SWIG_7(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_NotEqualTo__SWIG_6")] public static extern bool NotEqualTo__SWIG_6(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_EqualTo__SWIG_8")] public static extern bool EqualTo__SWIG_8(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_NotEqualTo__SWIG_7")] public static extern bool NotEqualTo__SWIG_7(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GreaterThan__SWIG_0")] public static extern bool GreaterThan__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GreaterThan__SWIG_1")] public static extern bool GreaterThan__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GreaterThan__SWIG_2")] public static extern bool GreaterThan__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_LessThan__SWIG_0")] public static extern bool LessThan__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_LessThan__SWIG_1")] public static extern bool LessThan__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_LessThan__SWIG_2")] public static extern bool LessThan__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Multiply")] public static extern global::System.IntPtr Multiply(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Subtract")] public static extern global::System.IntPtr Subtract(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Clamp__SWIG_4")] public static extern global::System.IntPtr Clamp__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Range")] public static extern float Range(float jarg1, float jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Axis")] public static extern global::System.IntPtr Axis(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_LessThan__SWIG_3")] public static extern bool LessThan__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_New")] public static extern global::System.IntPtr New(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_SignalConnectorType")] public static extern global::System.IntPtr new_SignalConnectorType(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, global::System.Runtime.InteropServices.HandleRef jarg3); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_SignalConnectorType")] public static extern void delete_SignalConnectorType(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_TypeAction")] public static extern global::System.IntPtr new_TypeAction(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, global::System.Runtime.InteropServices.HandleRef jarg3); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_TypeAction")] public static extern void delete_TypeAction(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_PropertyRegistration")] public static extern global::System.IntPtr new_PropertyRegistration(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3, int jarg4, global::System.Runtime.InteropServices.HandleRef jarg5, global::System.Runtime.InteropServices.HandleRef jarg6); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_PropertyRegistration")] public static extern void delete_PropertyRegistration(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_0")] public static extern global::System.IntPtr new_AnimatablePropertyRegistration__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3, int jarg4); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_AnimatablePropertyRegistration__SWIG_1")] public static extern global::System.IntPtr new_AnimatablePropertyRegistration__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3, global::System.Runtime.InteropServices.HandleRef jarg4); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_AnimatablePropertyRegistration")] public static extern void delete_AnimatablePropertyRegistration(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_AnimatablePropertyComponentRegistration")] public static extern global::System.IntPtr new_AnimatablePropertyComponentRegistration(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3, int jarg4, uint jarg5); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_AnimatablePropertyComponentRegistration")] public static extern void delete_AnimatablePropertyComponentRegistration(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_ChildPropertyRegistration")] public static extern global::System.IntPtr new_ChildPropertyRegistration(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, int jarg3, int jarg4); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_ChildPropertyRegistration")] public static extern void delete_ChildPropertyRegistration(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PI_get")] public static extern float PI_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PI_2_get")] public static extern float PI_2_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PI_4_get")] public static extern float PI_4_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PI_OVER_180_get")] public static extern float PI_OVER_180_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ONE80_OVER_PI_get")] public static extern float ONE80_OVER_PI_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ResizePolicyDefault_get")] public static extern int ResizePolicyDefault_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_UnparentAndReset")] public static extern void UnparentAndReset(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VisibilityChangedSignal")] public static extern global::System.IntPtr VisibilityChangedSignal(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_RelayoutContainer")] public static extern void delete_RelayoutContainer(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_RelayoutContainer_Add")] public static extern void RelayoutContainer_Add(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FittingModeDefault_get")] public static extern int FittingModeDefault_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_DEFAULT_get")] public static extern int DEFAULT_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_IsVertical")] public static extern bool IsVertical(int jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_IsHorizontal")] public static extern bool IsHorizontal(int jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_MoveActorConstraint")] public static extern void MoveActorConstraint(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WrapActorConstraint")] public static extern void WrapActorConstraint(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.PanGestureDetector.cs b/src/Tizen.NUI/src/internal/Interop/Interop.PanGestureDetector.cs index 1ae37e4..0025511 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.PanGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.PanGestureDetector.cs @@ -7,7 +7,7 @@ namespace Tizen.NUI internal static partial class Interop { internal static partial class PanGestureDetector - { + { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PanGesture_SWIGUpcast")] public static extern global::System.IntPtr PanGesture_SWIGUpcast(global::System.IntPtr jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.PixelData.cs b/src/Tizen.NUI/src/internal/Interop/Interop.PixelData.cs index e05b82b..cfa6cf3 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.PixelData.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.PixelData.cs @@ -12,7 +12,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr PixelData_SWIGUpcast(global::System.IntPtr jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_PixelData_New")] - public static extern global::System.IntPtr PixelData_New([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]byte[] jarg1, uint jarg2, uint jarg3, uint jarg4, int jarg5, int jarg6); + public static extern global::System.IntPtr PixelData_New([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] byte[] jarg1, uint jarg2, uint jarg3, uint jarg4, int jarg5, int jarg6); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_PixelData__SWIG_0")] public static extern global::System.IntPtr new_PixelData__SWIG_0(); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.ProgressBar.cs b/src/Tizen.NUI/src/internal/Interop/Interop.ProgressBar.cs index 34ed102..eeeb89d 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.ProgressBar.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.ProgressBar.cs @@ -7,7 +7,7 @@ namespace Tizen.NUI internal static partial class Interop { internal static partial class ProgressBar - { + { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_ProgressBar_SWIGUpcast")] public static extern global::System.IntPtr ProgressBar_SWIGUpcast(global::System.IntPtr jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.RefObject.cs b/src/Tizen.NUI/src/internal/Interop/Interop.RefObject.cs index d6d9f10..a1745e3 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.RefObject.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.RefObject.cs @@ -7,7 +7,7 @@ namespace Tizen.NUI internal static partial class Interop { internal static partial class RefObject - { + { [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_RefObject_Reference")] public static extern void RefObject_Reference(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TableView.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TableView.cs index 864da95..74f8969 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.TableView.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.TableView.cs @@ -196,7 +196,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TableView_SetCellAlignment")] public static extern void TableView_SetCellAlignment(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, int jarg3, int jarg4); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TableView_SWIGUpcast")] public static extern global::System.IntPtr TableView_SWIGUpcast(global::System.IntPtr jarg1); } diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs b/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs index d66ca70..72dabe4 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.TextField.cs @@ -226,13 +226,13 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ELLIPSIS_get")] public static extern int TextField_Property_ELLIPSIS_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_TextField_SelectWholeText")] public static extern void TextField_SelectWholeText(global::System.Runtime.InteropServices.HandleRef jarg1); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ENABLE_GRAB_HANDLE_get")] public static extern int TextField_Property_ENABLE_GRAB_HANDLE_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_TextField_Property_ENABLE_GRAB_HANDLE_POPUP_get")] public static extern int TextField_Property_ENABLE_GRAB_HANDLE_POPUP_get(); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Util.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Util.cs index ff8ce4e..68dc4a9 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Util.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Util.cs @@ -4,7 +4,7 @@ using System.Text; namespace Tizen.NUI { - + internal static partial class Interop { internal static partial class Util diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Vector2.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Vector2.cs index 935d02b..e0dbfaf 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Vector2.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Vector2.cs @@ -15,7 +15,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr new_Vector2__SWIG_1(float jarg1, float jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Vector2__SWIG_2")] - public static extern global::System.IntPtr new_Vector2__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg1); + public static extern global::System.IntPtr new_Vector2__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Vector2__SWIG_3")] public static extern global::System.IntPtr new_Vector2__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -42,7 +42,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr Vector2_ZERO_get(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Vector2_Assign__SWIG_0")] - public static extern global::System.IntPtr Vector2_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg2); + public static extern global::System.IntPtr Vector2_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Vector2_Assign__SWIG_1")] public static extern global::System.IntPtr Vector2_Assign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Vector3.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Vector3.cs index 950c167..4665222 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Vector3.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Vector3.cs @@ -3,7 +3,7 @@ using System.Collections.Generic; using System.Text; namespace Tizen.NUI -{ +{ internal static partial class Interop { internal static partial class Vector3 @@ -15,7 +15,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr new_Vector3__SWIG_1(float jarg1, float jarg2, float jarg3); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Vector3__SWIG_2")] - public static extern global::System.IntPtr new_Vector3__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg1); + public static extern global::System.IntPtr new_Vector3__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Vector3__SWIG_3")] public static extern global::System.IntPtr new_Vector3__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -48,7 +48,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr Vector3_ZERO_get(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Vector3_Assign__SWIG_0")] - public static extern global::System.IntPtr Vector3_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg2); + public static extern global::System.IntPtr Vector3_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Vector3_Assign__SWIG_1")] public static extern global::System.IntPtr Vector3_Assign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Vector4.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Vector4.cs index 907bdfc..fbb2c93 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Vector4.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Vector4.cs @@ -15,7 +15,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr new_Vector4__SWIG_1(float jarg1, float jarg2, float jarg3, float jarg4); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Vector4__SWIG_2")] - public static extern global::System.IntPtr new_Vector4__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg1); + public static extern global::System.IntPtr new_Vector4__SWIG_2([global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_new_Vector4__SWIG_3")] public static extern global::System.IntPtr new_Vector4__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -39,7 +39,7 @@ namespace Tizen.NUI public static extern global::System.IntPtr Vector4_ZERO_get(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Vector4_Assign__SWIG_0")] - public static extern global::System.IntPtr Vector4_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]float[] jarg2); + public static extern global::System.IntPtr Vector4_Assign__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] float[] jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Vector4_Assign__SWIG_1")] public static extern global::System.IntPtr Vector4_Assign__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.VectorUnsignedChar.cs b/src/Tizen.NUI/src/internal/Interop/Interop.VectorUnsignedChar.cs index fe384ad..f1ccbf8 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.VectorUnsignedChar.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.VectorUnsignedChar.cs @@ -36,10 +36,10 @@ namespace Tizen.NUI public static extern void VectorUnsignedChar_PushBack(global::System.Runtime.InteropServices.HandleRef jarg1, byte jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Insert__SWIG_0")] - public static extern void VectorUnsignedChar_Insert__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]byte[] jarg2, byte jarg3); + public static extern void VectorUnsignedChar_Insert__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] byte[] jarg2, byte jarg3); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Insert__SWIG_1")] - public static extern void VectorUnsignedChar_Insert__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]byte[] jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4); + public static extern void VectorUnsignedChar_Insert__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] byte[] jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, global::System.Runtime.InteropServices.HandleRef jarg4); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Reserve")] public static extern void VectorUnsignedChar_Reserve(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2); @@ -51,13 +51,13 @@ namespace Tizen.NUI public static extern void VectorUnsignedChar_Resize__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, uint jarg2, byte jarg3); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Erase__SWIG_0")] - public static extern global::System.IntPtr VectorUnsignedChar_Erase__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]byte[] jarg2); + public static extern global::System.IntPtr VectorUnsignedChar_Erase__SWIG_0(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] byte[] jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Erase__SWIG_1")] - public static extern global::System.IntPtr VectorUnsignedChar_Erase__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]byte[] jarg2, global::System.Runtime.InteropServices.HandleRef jarg3); + public static extern global::System.IntPtr VectorUnsignedChar_Erase__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] byte[] jarg2, global::System.Runtime.InteropServices.HandleRef jarg3); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Remove")] - public static extern void VectorUnsignedChar_Remove(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)]byte[] jarg2); + public static extern void VectorUnsignedChar_Remove(global::System.Runtime.InteropServices.HandleRef jarg1, [global::System.Runtime.InteropServices.In, global::System.Runtime.InteropServices.MarshalAs(global::System.Runtime.InteropServices.UnmanagedType.LPArray)] byte[] jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_VectorUnsignedChar_Swap")] public static extern void VectorUnsignedChar_Swap(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.View.cs b/src/Tizen.NUI/src/internal/Interop/Interop.View.cs index 07df53c..b591ea8 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.View.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.View.cs @@ -4,7 +4,7 @@ using System.Text; namespace Tizen.NUI { - internal static partial class Interop + internal static partial class Interop { internal static partial class View { diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.WidgetImpl.cs b/src/Tizen.NUI/src/internal/Interop/Interop.WidgetImpl.cs index 20fd090..f23d6dc 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.WidgetImpl.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.WidgetImpl.cs @@ -71,7 +71,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_WidgetImpl_director_connect")] public static extern void WidgetImpl_director_connect(global::System.Runtime.InteropServices.HandleRef jarg1, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_0 delegate0, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_1 delegate1, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_2 delegate2, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_3 delegate3, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_4 delegate4, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_5 delegate5, - Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_6 delegate6, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_7 delegate7); + Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_6 delegate6, Tizen.NUI.WidgetImpl.SwigDelegateWidgetImpl_7 delegate7); } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs b/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs index e4f7a05..888242b 100755 --- a/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs +++ b/src/Tizen.NUI/src/internal/Interop/Interop.Window.cs @@ -34,7 +34,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_New_Root_Layout")] public static extern global::System.IntPtr Window_NewRootLayout(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_SetClass")] public static extern void Window_SetClass(global::System.Runtime.InteropServices.HandleRef jarg1, string jarg2, string jarg3); @@ -64,10 +64,10 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_SetAvailableOrientations")] public static extern void Window_SetAvailableOrientations(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_SetPositionSize")] public static extern void Window_SetPositionSize(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_SWIGUpcast")] public static extern global::System.IntPtr Window_SWIGUpcast(global::System.IntPtr jarg1); @@ -142,7 +142,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_GetBrightness")] public static extern int GetBrightness(global::System.Runtime.InteropServices.HandleRef jarg1); - + // For windows resized signal [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Window_ResizeSignal")] public static extern global::System.IntPtr Window_ResizeSignal(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Interop/ManualPINVOKE.cs b/src/Tizen.NUI/src/internal/Interop/ManualPINVOKE.cs index 87d50f7..23aad52 100755 --- a/src/Tizen.NUI/src/internal/Interop/ManualPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/Interop/ManualPINVOKE.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_HIDDENINPUT_PROPERTY_SHOW_LAST_CHARACTER_DURATION_get")] public static extern int HIDDENINPUT_PROPERTY_SHOW_LAST_CHARACTER_DURATION_get(); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_LINE_MUST_BREAK_get")] public static extern int LINE_MUST_BREAK_get(); diff --git a/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs index 82b197e..bbfce31 100755 --- a/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/Interop/NDalicPINVOKE.cs @@ -22,128 +22,128 @@ namespace Tizen.NUI { public const string Lib = "libdali2-csharp-binder.so"; protected class SWIGExceptionHelper - { - /// 3 - public delegate void ExceptionDelegate(string message); - /// 3 - public delegate void ExceptionArgumentDelegate(string message, string paramName); - static ExceptionDelegate applicationDelegate = new ExceptionDelegate(SetPendingApplicationException); - static ExceptionDelegate arithmeticDelegate = new ExceptionDelegate(SetPendingArithmeticException); - static ExceptionDelegate divideByZeroDelegate = new ExceptionDelegate(SetPendingDivideByZeroException); - static ExceptionDelegate indexOutOfRangeDelegate = new ExceptionDelegate(SetPendingIndexOutOfRangeException); - static ExceptionDelegate invalidCastDelegate = new ExceptionDelegate(SetPendingInvalidCastException); - static ExceptionDelegate invalidOperationDelegate = new ExceptionDelegate(SetPendingInvalidOperationException); - static ExceptionDelegate ioDelegate = new ExceptionDelegate(SetPendingIOException); - static ExceptionDelegate nullReferenceDelegate = new ExceptionDelegate(SetPendingNullReferenceException); - static ExceptionDelegate outOfMemoryDelegate = new ExceptionDelegate(SetPendingOutOfMemoryException); - static ExceptionDelegate overflowDelegate = new ExceptionDelegate(SetPendingOverflowException); - static ExceptionDelegate systemDelegate = new ExceptionDelegate(SetPendingSystemException); - static ExceptionArgumentDelegate argumentDelegate = new ExceptionArgumentDelegate(SetPendingArgumentException); - static ExceptionArgumentDelegate argumentNullDelegate = new ExceptionArgumentDelegate(SetPendingArgumentNullException); - static ExceptionArgumentDelegate argumentOutOfRangeDelegate = new ExceptionArgumentDelegate(SetPendingArgumentOutOfRangeException); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "SWIGRegisterExceptionCallbacks_NDalic")] - public static extern void SWIGRegisterExceptionCallbacks_NDalic( - ExceptionDelegate applicationDelegate, - ExceptionDelegate arithmeticDelegate, - ExceptionDelegate divideByZeroDelegate, - ExceptionDelegate indexOutOfRangeDelegate, - ExceptionDelegate invalidCastDelegate, - ExceptionDelegate invalidOperationDelegate, - ExceptionDelegate ioDelegate, - ExceptionDelegate nullReferenceDelegate, - ExceptionDelegate outOfMemoryDelegate, - ExceptionDelegate overflowDelegate, - ExceptionDelegate systemExceptionDelegate); - - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "SWIGRegisterExceptionArgumentCallbacks_NDalic")] - public static extern void SWIGRegisterExceptionCallbacksArgument_NDalic( - ExceptionArgumentDelegate argumentDelegate, - ExceptionArgumentDelegate argumentNullDelegate, - ExceptionArgumentDelegate argumentOutOfRangeDelegate); - static void SetPendingApplicationException(string message) - { - SWIGPendingException.Set(new global::System.ApplicationException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingArithmeticException(string message) - { - SWIGPendingException.Set(new global::System.ArithmeticException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingDivideByZeroException(string message) - { - SWIGPendingException.Set(new global::System.DivideByZeroException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingIndexOutOfRangeException(string message) - { - SWIGPendingException.Set(new global::System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingInvalidCastException(string message) - { - SWIGPendingException.Set(new global::System.InvalidCastException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingInvalidOperationException(string message) - { - SWIGPendingException.Set(new global::System.InvalidOperationException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingIOException(string message) - { - SWIGPendingException.Set(new global::System.IO.IOException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingNullReferenceException(string message) - { - SWIGPendingException.Set(new global::System.NullReferenceException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingOutOfMemoryException(string message) - { - SWIGPendingException.Set(new global::System.OutOfMemoryException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingOverflowException(string message) - { - SWIGPendingException.Set(new global::System.OverflowException(message, SWIGPendingException.Retrieve())); - } - static void SetPendingSystemException(string message) - { - SWIGPendingException.Set(new global::System.SystemException(message, SWIGPendingException.Retrieve())); - } - - static void SetPendingArgumentException(string message, string paramName) - { - SWIGPendingException.Set(new global::System.ArgumentException(message, paramName, SWIGPendingException.Retrieve())); - } - static void SetPendingArgumentNullException(string message, string paramName) - { - global::System.Exception e = SWIGPendingException.Retrieve(); - if (e != null) message = message + " Inner Exception: " + e.Message; - SWIGPendingException.Set(new global::System.ArgumentNullException(message, paramName)); - } - static void SetPendingArgumentOutOfRangeException(string message, string paramName) - { - global::System.Exception e = SWIGPendingException.Retrieve(); - if (e != null) message = message + " Inner Exception: " + e.Message; - SWIGPendingException.Set(new global::System.ArgumentOutOfRangeException(paramName, message)); - } - static SWIGExceptionHelper() - { - SWIGRegisterExceptionCallbacks_NDalic( - applicationDelegate, - arithmeticDelegate, - divideByZeroDelegate, - indexOutOfRangeDelegate, - invalidCastDelegate, - invalidOperationDelegate, - ioDelegate, - nullReferenceDelegate, - outOfMemoryDelegate, - overflowDelegate, - systemDelegate); - - SWIGRegisterExceptionCallbacksArgument_NDalic( - argumentDelegate, - argumentNullDelegate, - argumentOutOfRangeDelegate); - } - } - protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper(); + { + /// 3 + public delegate void ExceptionDelegate(string message); + /// 3 + public delegate void ExceptionArgumentDelegate(string message, string paramName); + static ExceptionDelegate applicationDelegate = new ExceptionDelegate(SetPendingApplicationException); + static ExceptionDelegate arithmeticDelegate = new ExceptionDelegate(SetPendingArithmeticException); + static ExceptionDelegate divideByZeroDelegate = new ExceptionDelegate(SetPendingDivideByZeroException); + static ExceptionDelegate indexOutOfRangeDelegate = new ExceptionDelegate(SetPendingIndexOutOfRangeException); + static ExceptionDelegate invalidCastDelegate = new ExceptionDelegate(SetPendingInvalidCastException); + static ExceptionDelegate invalidOperationDelegate = new ExceptionDelegate(SetPendingInvalidOperationException); + static ExceptionDelegate ioDelegate = new ExceptionDelegate(SetPendingIOException); + static ExceptionDelegate nullReferenceDelegate = new ExceptionDelegate(SetPendingNullReferenceException); + static ExceptionDelegate outOfMemoryDelegate = new ExceptionDelegate(SetPendingOutOfMemoryException); + static ExceptionDelegate overflowDelegate = new ExceptionDelegate(SetPendingOverflowException); + static ExceptionDelegate systemDelegate = new ExceptionDelegate(SetPendingSystemException); + static ExceptionArgumentDelegate argumentDelegate = new ExceptionArgumentDelegate(SetPendingArgumentException); + static ExceptionArgumentDelegate argumentNullDelegate = new ExceptionArgumentDelegate(SetPendingArgumentNullException); + static ExceptionArgumentDelegate argumentOutOfRangeDelegate = new ExceptionArgumentDelegate(SetPendingArgumentOutOfRangeException); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "SWIGRegisterExceptionCallbacks_NDalic")] + public static extern void SWIGRegisterExceptionCallbacks_NDalic( + ExceptionDelegate applicationDelegate, + ExceptionDelegate arithmeticDelegate, + ExceptionDelegate divideByZeroDelegate, + ExceptionDelegate indexOutOfRangeDelegate, + ExceptionDelegate invalidCastDelegate, + ExceptionDelegate invalidOperationDelegate, + ExceptionDelegate ioDelegate, + ExceptionDelegate nullReferenceDelegate, + ExceptionDelegate outOfMemoryDelegate, + ExceptionDelegate overflowDelegate, + ExceptionDelegate systemExceptionDelegate); + + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "SWIGRegisterExceptionArgumentCallbacks_NDalic")] + public static extern void SWIGRegisterExceptionCallbacksArgument_NDalic( + ExceptionArgumentDelegate argumentDelegate, + ExceptionArgumentDelegate argumentNullDelegate, + ExceptionArgumentDelegate argumentOutOfRangeDelegate); + static void SetPendingApplicationException(string message) + { + SWIGPendingException.Set(new global::System.ApplicationException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingArithmeticException(string message) + { + SWIGPendingException.Set(new global::System.ArithmeticException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingDivideByZeroException(string message) + { + SWIGPendingException.Set(new global::System.DivideByZeroException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingIndexOutOfRangeException(string message) + { + SWIGPendingException.Set(new global::System.IndexOutOfRangeException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingInvalidCastException(string message) + { + SWIGPendingException.Set(new global::System.InvalidCastException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingInvalidOperationException(string message) + { + SWIGPendingException.Set(new global::System.InvalidOperationException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingIOException(string message) + { + SWIGPendingException.Set(new global::System.IO.IOException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingNullReferenceException(string message) + { + SWIGPendingException.Set(new global::System.NullReferenceException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingOutOfMemoryException(string message) + { + SWIGPendingException.Set(new global::System.OutOfMemoryException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingOverflowException(string message) + { + SWIGPendingException.Set(new global::System.OverflowException(message, SWIGPendingException.Retrieve())); + } + static void SetPendingSystemException(string message) + { + SWIGPendingException.Set(new global::System.SystemException(message, SWIGPendingException.Retrieve())); + } + + static void SetPendingArgumentException(string message, string paramName) + { + SWIGPendingException.Set(new global::System.ArgumentException(message, paramName, SWIGPendingException.Retrieve())); + } + static void SetPendingArgumentNullException(string message, string paramName) + { + global::System.Exception e = SWIGPendingException.Retrieve(); + if (e != null) message = message + " Inner Exception: " + e.Message; + SWIGPendingException.Set(new global::System.ArgumentNullException(message, paramName)); + } + static void SetPendingArgumentOutOfRangeException(string message, string paramName) + { + global::System.Exception e = SWIGPendingException.Retrieve(); + if (e != null) message = message + " Inner Exception: " + e.Message; + SWIGPendingException.Set(new global::System.ArgumentOutOfRangeException(paramName, message)); + } + static SWIGExceptionHelper() + { + SWIGRegisterExceptionCallbacks_NDalic( + applicationDelegate, + arithmeticDelegate, + divideByZeroDelegate, + indexOutOfRangeDelegate, + invalidCastDelegate, + invalidOperationDelegate, + ioDelegate, + nullReferenceDelegate, + outOfMemoryDelegate, + overflowDelegate, + systemDelegate); + + SWIGRegisterExceptionCallbacksArgument_NDalic( + argumentDelegate, + argumentNullDelegate, + argumentOutOfRangeDelegate); + } + } + protected static SWIGExceptionHelper swigExceptionHelper = new SWIGExceptionHelper(); /// 3 public class SWIGPendingException @@ -227,8 +227,8 @@ namespace Tizen.NUI Tizen.Log.Error("NUI", "Create NDalicPINVOKE"); } - [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_BaseHandle")] - public static extern void delete_BaseHandle(global::System.Runtime.InteropServices.HandleRef jarg1); + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_delete_BaseHandle")] + public static extern void delete_BaseHandle(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_Application_SWIGUpcast")] public static extern global::System.IntPtr Application_SWIGUpcast(global::System.IntPtr jarg1); diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs index 59f2393..f719f23 100755 --- a/src/Tizen.NUI/src/internal/ItemView.cs +++ b/src/Tizen.NUI/src/internal/ItemView.cs @@ -156,7 +156,7 @@ namespace Tizen.NUI internal static ItemView DownCast(BaseHandle handle) { - ItemView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as ItemView; + ItemView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as ItemView; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs b/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs index f347b11..dc14a43 100755 --- a/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs +++ b/src/Tizen.NUI/src/internal/KeyboardTypeSignalType.cs @@ -24,7 +24,7 @@ namespace Tizen.NUI /// KeyboardTypeSignalType /// /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public class KeyboardTypeSignalType : Disposable @@ -47,7 +47,7 @@ namespace Tizen.NUI /// /// True if there are any slots connected to the signal /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public bool Empty() @@ -62,7 +62,7 @@ namespace Tizen.NUI /// /// The number of slots connected to this signal /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public uint GetConnectionCount() @@ -77,7 +77,7 @@ namespace Tizen.NUI /// /// The function to connect /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public void Connect(System.Delegate func) @@ -94,7 +94,7 @@ namespace Tizen.NUI /// /// The function to disconnect /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public void Disconnect(System.Delegate func) @@ -111,7 +111,7 @@ namespace Tizen.NUI /// /// The member function to connect /// 5 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public void Emit(InputMethodContext.KeyboardType arg) @@ -124,7 +124,7 @@ namespace Tizen.NUI /// The contructor. /// /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use InputMethodContext.KeyboardTypeChanged event instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public KeyboardTypeSignalType() : this(Interop.KeyboardTypeSignalType.new_KeyboardTypeSignalType(), true) diff --git a/src/Tizen.NUI/src/internal/Layouting/Interop/Interop.FlexLayout.cs b/src/Tizen.NUI/src/internal/Layouting/Interop/Interop.FlexLayout.cs index 892f8ac..8baed08 100755 --- a/src/Tizen.NUI/src/internal/Layouting/Interop/Interop.FlexLayout.cs +++ b/src/Tizen.NUI/src/internal/Layouting/Interop/Interop.FlexLayout.cs @@ -12,19 +12,19 @@ namespace Tizen.NUI public static extern global::System.IntPtr FlexLayout_New(); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_SetContext")] - public static extern global::System.IntPtr FlexLayout_SetContext( global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + public static extern global::System.IntPtr FlexLayout_SetContext(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_SetMeasureFunction")] - public static extern global::System.IntPtr FlexLayout_SetMeasureFunction( global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + public static extern global::System.IntPtr FlexLayout_SetMeasureFunction(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_AddChildWithMargin")] - public static extern global::System.IntPtr FlexLayout_AddChildWithMargin( global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, Tizen.NUI.FlexLayout.ChildMeasureCallback jarg4, int jarg5); + public static extern global::System.IntPtr FlexLayout_AddChildWithMargin(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2, global::System.Runtime.InteropServices.HandleRef jarg3, Tizen.NUI.FlexLayout.ChildMeasureCallback jarg4, int jarg5); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_RemoveChild")] - public static extern global::System.IntPtr FlexLayout_RemoveChild( global::System.Runtime.InteropServices.HandleRef jarg1, LayoutItem jarg2); + public static extern global::System.IntPtr FlexLayout_RemoveChild(global::System.Runtime.InteropServices.HandleRef jarg1, LayoutItem jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_CalculateLayout")] - public static extern global::System.IntPtr FlexLayout_CalculateLayout( global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3, bool jarg4); + public static extern global::System.IntPtr FlexLayout_CalculateLayout(global::System.Runtime.InteropServices.HandleRef jarg1, float jarg2, float jarg3, bool jarg4); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_GetWidth")] public static extern float FlexLayout_GetWidth(global::System.Runtime.InteropServices.HandleRef jarg1); @@ -36,13 +36,13 @@ namespace Tizen.NUI public static extern global::System.IntPtr FlexLayout_GetNodeFrame(global::System.Runtime.InteropServices.HandleRef jarg1, int index); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_MarkDirty")] - public static extern global::System.IntPtr FlexLayout_MarkDirty (global::System.Runtime.InteropServices.HandleRef jarg1); + public static extern global::System.IntPtr FlexLayout_MarkDirty(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_SetMargin")] - public static extern global::System.IntPtr FlexLayout_SetMargin( global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + public static extern global::System.IntPtr FlexLayout_SetMargin(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_SetPadding")] - public static extern global::System.IntPtr FlexLayout_SetPadding( global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); + public static extern global::System.IntPtr FlexLayout_SetPadding(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_FlexLayout_DownCast")] public static extern global::System.IntPtr FlexLayout_DownCast(global::System.Runtime.InteropServices.HandleRef jarg1); diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs index 06fde1c..a503ea9 100755 --- a/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs +++ b/src/Tizen.NUI/src/internal/Layouting/LayoutController.cs @@ -80,11 +80,11 @@ namespace Tizen.NUI ILayoutParent layoutParent = layoutItem.GetParent(); if (layoutParent != null) { - LayoutGroup layoutGroup = layoutParent as LayoutGroup; - if(layoutGroup != null && !layoutGroup.LayoutRequested) - { + LayoutGroup layoutGroup = layoutParent as LayoutGroup; + if (layoutGroup != null && !layoutGroup.LayoutRequested) + { layoutGroup.RequestLayout(); - } + } } } @@ -105,13 +105,13 @@ namespace Tizen.NUI /// Reset to False if explicit control no longer required. /// [EditorBrowsable(EditorBrowsableState.Never)] - public bool OverrideCoreAnimation {get;set;} = false; + public bool OverrideCoreAnimation { get; set; } = false; /// /// Add transition data for a LayoutItem to the transition stack. /// /// Transition data for a LayoutItem. - internal void AddTransitionDataEntry( LayoutData transitionDataEntry) + internal void AddTransitionDataEntry(LayoutData transitionDataEntry) { _layoutTransitionDataQueue.Add(transitionDataEntry); } @@ -120,7 +120,7 @@ namespace Tizen.NUI /// Add LayoutItem to a removal stack for removal after transitions finish. /// /// LayoutItem to remove. - internal void AddToRemovalStack( LayoutItem itemToRemove) + internal void AddToRemovalStack(LayoutItem itemToRemove) { if (_itemRemovalQueue == null) { @@ -158,7 +158,7 @@ namespace Tizen.NUI { if (rootNode.Layout != null) { - Debug.WriteLineIf( LayoutDebugController, "LayoutController Root found:" + rootNode.Name); + Debug.WriteLineIf(LayoutDebugController, "LayoutController Root found:" + rootNode.Name); // rootNode has a layout, start measuring and layouting from here. MeasureAndLayout(rootNode); } @@ -177,7 +177,7 @@ namespace Tizen.NUI // Can be called from multiple starting roots but in series. void MeasureAndLayout(View root) { - if (root !=null) + if (root != null) { // Get parent MeasureSpecification, this could be the Window or View with an exact size. Container parentNode = root.GetParent(); @@ -206,7 +206,7 @@ namespace Tizen.NUI MeasureSpecification.ModeType widthMode = MeasureSpecification.ModeType.Unspecified; MeasureSpecification.ModeType heightMode = MeasureSpecification.ModeType.Unspecified; - if ( root.WidthSpecification >= 0 ) + if (root.WidthSpecification >= 0) { // exact size provided so match width exactly width = new LayoutLength(root.WidthSpecification); @@ -218,7 +218,7 @@ namespace Tizen.NUI widthMode = MeasureSpecification.ModeType.Exactly; } - if (root.HeightSpecification >= 0 ) + if (root.HeightSpecification >= 0) { // exact size provided so match height exactly height = new LayoutLength(root.HeightSpecification); @@ -230,23 +230,23 @@ namespace Tizen.NUI } MeasureSpecification parentWidthSpecification = - new MeasureSpecification( width, widthMode); + new MeasureSpecification(width, widthMode); MeasureSpecification parentHeightSpecification = - new MeasureSpecification( height, heightMode); + new MeasureSpecification(height, heightMode); // Start at root with it's parent's widthSpecification and heightSpecification MeasureHierarchy(root, parentWidthSpecification, parentHeightSpecification); // Start at root which was just measured. - PerformLayout( root, new LayoutLength(rootPosition.X), + PerformLayout(root, new LayoutLength(rootPosition.X), new LayoutLength(rootPosition.Y), new LayoutLength(rootPosition.X) + root.Layout.MeasuredWidth.Size, - new LayoutLength(rootPosition.Y) + root.Layout.MeasuredHeight.Size ); + new LayoutLength(rootPosition.Y) + root.Layout.MeasuredHeight.Size); bool readyToPlay = SetupCoreAnimation(); - if (readyToPlay && OverrideCoreAnimation==false) + if (readyToPlay && OverrideCoreAnimation == false) { PlayAnimation(); } @@ -297,7 +297,7 @@ namespace Tizen.NUI /// private void PerformLayout(View root, LayoutLength left, LayoutLength top, LayoutLength right, LayoutLength bottom) { - if(root.Layout != null) + if (root.Layout != null) { root.Layout.Layout(left, top, right, bottom); } @@ -308,7 +308,7 @@ namespace Tizen.NUI /// private void PlayAnimation() { - Debug.WriteLineIf( LayoutDebugController, "LayoutController Playing, Core Duration:" + _coreAnimation.Duration); + Debug.WriteLineIf(LayoutDebugController, "LayoutController Playing, Core Duration:" + _coreAnimation.Duration); _coreAnimation.Play(); } @@ -327,7 +327,7 @@ namespace Tizen.NUI // Check again incase the parent has already been removed. ILayoutParent layoutParent = item.GetParent(); LayoutGroup layoutGroup = layoutParent as LayoutGroup; - if (layoutGroup !=null) + if (layoutGroup != null) { layoutGroup.Owner?.RemoveChild(item.Owner); } @@ -342,7 +342,7 @@ namespace Tizen.NUI // of the other stack. Then the main removal stack iterated when AnimationFinished // occurs again. } - Debug.WriteLineIf( LayoutDebugController, "LayoutController AnimationFinished"); + Debug.WriteLineIf(LayoutDebugController, "LayoutController AnimationFinished"); _coreAnimation?.Clear(); } @@ -355,10 +355,10 @@ namespace Tizen.NUI // Initialize animation for this layout run. bool animationPending = false; - Debug.WriteLineIf( LayoutDebugController, + Debug.WriteLineIf(LayoutDebugController, "LayoutController SetupCoreAnimation for:" + _layoutTransitionDataQueue.Count); - if (_layoutTransitionDataQueue.Count > 0 ) // Something to animate + if (_layoutTransitionDataQueue.Count > 0) // Something to animate { if (!_coreAnimation) { @@ -385,7 +385,7 @@ namespace Tizen.NUI private void SetupAnimationForPosition(LayoutData layoutPositionData, TransitionComponents positionTransitionComponents) { // A removed item does not have a valid target position within the layout so don't try to position. - if( layoutPositionData.ConditionForAnimation != TransitionCondition.Remove ) + if (layoutPositionData.ConditionForAnimation != TransitionCondition.Remove) { _coreAnimation.AnimateTo(layoutPositionData.Item.Owner, "Position", new Vector3(layoutPositionData.Left, @@ -393,14 +393,14 @@ namespace Tizen.NUI layoutPositionData.Item.Owner.Position.Z), positionTransitionComponents.Delay, positionTransitionComponents.Duration, - positionTransitionComponents.AlphaFunction ); + positionTransitionComponents.AlphaFunction); - Debug.WriteLineIf( LayoutDebugController, + Debug.WriteLineIf(LayoutDebugController, "LayoutController SetupAnimationForPosition View:" + layoutPositionData.Item.Owner.Name + " left:" + layoutPositionData.Left + " top:" + layoutPositionData.Top + " delay:" + positionTransitionComponents.Delay + - " duration:" + positionTransitionComponents.Duration ); + " duration:" + positionTransitionComponents.Duration); } } @@ -410,51 +410,51 @@ namespace Tizen.NUI // It is due to the internals of the Text not being able to recalculate fast enough. if (layoutPositionData.Item.Owner is TextLabel || layoutPositionData.Item.Owner is TextField) { - float itemWidth = layoutPositionData.Right-layoutPositionData.Left; - float itemHeight = layoutPositionData.Bottom-layoutPositionData.Top; + float itemWidth = layoutPositionData.Right - layoutPositionData.Left; + float itemHeight = layoutPositionData.Bottom - layoutPositionData.Top; // Set size directly. layoutPositionData.Item.Owner.Size2D = new Size2D((int)itemWidth, (int)itemHeight); } else { _coreAnimation.AnimateTo(layoutPositionData.Item.Owner, "Size", - new Vector3(layoutPositionData.Right-layoutPositionData.Left, - layoutPositionData.Bottom-layoutPositionData.Top, + new Vector3(layoutPositionData.Right - layoutPositionData.Left, + layoutPositionData.Bottom - layoutPositionData.Top, layoutPositionData.Item.Owner.Position.Z), sizeTransitionComponents.Delay, sizeTransitionComponents.Duration, sizeTransitionComponents.AlphaFunction); - Debug.WriteLineIf( LayoutDebugController, + Debug.WriteLineIf(LayoutDebugController, "LayoutController SetupAnimationForSize View:" + layoutPositionData.Item.Owner.Name + - " width:" + (layoutPositionData.Right-layoutPositionData.Left) + - " height:" + (layoutPositionData.Bottom-layoutPositionData.Top) + + " width:" + (layoutPositionData.Right - layoutPositionData.Left) + + " height:" + (layoutPositionData.Bottom - layoutPositionData.Top) + " delay:" + sizeTransitionComponents.Delay + - " duration:" + sizeTransitionComponents.Duration ); + " duration:" + sizeTransitionComponents.Duration); } } - void SetupAnimationForCustomTransitions(TransitionList transitionsToAnimate, View view ) + void SetupAnimationForCustomTransitions(TransitionList transitionsToAnimate, View view) { if (transitionsToAnimate?.Count > 0) { foreach (LayoutTransition transition in transitionsToAnimate) { - if ( transition.AnimatableProperty != AnimatableProperties.Position && - transition.AnimatableProperty != AnimatableProperties.Size ) + if (transition.AnimatableProperty != AnimatableProperties.Position && + transition.AnimatableProperty != AnimatableProperties.Size) { _coreAnimation.AnimateTo(view, transition.AnimatableProperty.ToString(), transition.TargetValue, transition.Animator.Delay, transition.Animator.Duration, - transition.Animator.AlphaFunction ); + transition.Animator.AlphaFunction); - Debug.WriteLineIf( LayoutDebugController, + Debug.WriteLineIf(LayoutDebugController, "LayoutController SetupAnimationForCustomTransitions View:" + view.Name + " Property:" + transition.AnimatableProperty.ToString() + " delay:" + transition.Animator.Delay + - " duration:" + transition.Animator.Duration ); + " duration:" + transition.Animator.Duration); } } } @@ -467,7 +467,7 @@ namespace Tizen.NUI AnimatableProperties propertyToMatch, ref TransitionComponents transitionComponentToUpdate) { - foreach( LayoutTransition transition in sourceTransitionList) + foreach (LayoutTransition transition in sourceTransitionList) { if (transition.AnimatableProperty == propertyToMatch) { @@ -477,7 +477,7 @@ namespace Tizen.NUI } } - private TransitionComponents CreateDefaultTransitionComponent( int delay, int duration ) + private TransitionComponents CreateDefaultTransitionComponent(int delay, int duration) { AlphaFunction alphaFunction = new AlphaFunction(AlphaFunction.BuiltinFunctions.Linear); return new TransitionComponents(delay, duration, alphaFunction); @@ -486,7 +486,7 @@ namespace Tizen.NUI /// /// Sets up the main animation with the animators for each item (each layoutPositionData structure) /// - private void AddAnimatorsToAnimation( LayoutData layoutPositionData ) + private void AddAnimatorsToAnimation(LayoutData layoutPositionData) { LayoutTransition positionTransition = new LayoutTransition(); LayoutTransition sizeTransition = new LayoutTransition(); @@ -521,14 +521,14 @@ namespace Tizen.NUI { // Inherit parent transitions as none already set on View for the condition. ILayoutParent layoutParent = layoutPositionData.Item.GetParent(); - if (layoutParent !=null) + if (layoutParent != null) { // Item doesn't have it's own transitions for this condition so copy parents if // has a parent with transitions. LayoutGroup layoutGroup = layoutParent as LayoutGroup; TransitionList parentTransitionList; // Note TryGetValue returns null if key not matched. - if (layoutGroup !=null && layoutGroup.Owner.LayoutTransitions.TryGetValue(conditionForAnimators, out parentTransitionList)) + if (layoutGroup != null && layoutGroup.Owner.LayoutTransitions.TryGetValue(conditionForAnimators, out parentTransitionList)) { // Copy parent transitions to temporary TransitionList. List contains transitions for the current condition. LayoutTransitionsHelper.CopyTransitions(parentTransitionList, diff --git a/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs b/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs index 1f89f74..e3c29f1 100755 --- a/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs +++ b/src/Tizen.NUI/src/internal/Layouting/LayoutData.cs @@ -31,7 +31,7 @@ namespace Tizen.NUI /// Top position. /// Right position. /// Bottom position. - public LayoutData( LayoutItem item, TransitionCondition condition, float left, float top, float right, float bottom ) + public LayoutData(LayoutItem item, TransitionCondition condition, float left, float top, float right, float bottom) { Item = item; ConditionForAnimation = condition; @@ -41,14 +41,14 @@ namespace Tizen.NUI Bottom = bottom; } - public LayoutItem Item{ get;} + public LayoutItem Item { get; } - public TransitionCondition ConditionForAnimation{get;} + public TransitionCondition ConditionForAnimation { get; } - public float Left{get;} - public float Top{get;} - public float Right{get;} - public float Bottom{get;} + public float Left { get; } + public float Top { get; } + public float Right { get; } + public float Bottom { get; } }; diff --git a/src/Tizen.NUI/src/internal/LinearConstrainer.cs b/src/Tizen.NUI/src/internal/LinearConstrainer.cs index ffa0b29..ed9741a 100755 --- a/src/Tizen.NUI/src/internal/LinearConstrainer.cs +++ b/src/Tizen.NUI/src/internal/LinearConstrainer.cs @@ -47,7 +47,7 @@ namespace Tizen.NUI internal static LinearConstrainer DownCast(BaseHandle handle) { - LinearConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as LinearConstrainer; + LinearConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as LinearConstrainer; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/LowMemorySignalType.cs b/src/Tizen.NUI/src/internal/LowMemorySignalType.cs index cd5fc1a..6169c12 100755 --- a/src/Tizen.NUI/src/internal/LowMemorySignalType.cs +++ b/src/Tizen.NUI/src/internal/LowMemorySignalType.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + namespace Tizen.NUI { internal class LowMemorySignalType : Disposable diff --git a/src/Tizen.NUI/src/internal/Model3dView.cs b/src/Tizen.NUI/src/internal/Model3dView.cs index a7c12ef..aaad034 100755 --- a/src/Tizen.NUI/src/internal/Model3dView.cs +++ b/src/Tizen.NUI/src/internal/Model3dView.cs @@ -72,7 +72,7 @@ namespace Tizen.NUI public static Model3dView DownCast(BaseHandle handle) { - Model3dView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Model3dView; + Model3dView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as Model3dView; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/NUIComponentCoreBackend.cs b/src/Tizen.NUI/src/internal/NUIComponentCoreBackend.cs index b5334c0..0805631 100755 --- a/src/Tizen.NUI/src/internal/NUIComponentCoreBackend.cs +++ b/src/Tizen.NUI/src/internal/NUIComponentCoreBackend.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI class NUIComponentCoreBackend : ICoreBackend { private Dictionary _componentFactories; - public Dictionary ComponentFactories + public Dictionary ComponentFactories { set { @@ -119,7 +119,7 @@ namespace Tizen.NUI args[0] = Tizen.Applications.Application.Current.ApplicationInfo.ExecutablePath; _application = ComponentApplication.NewComponentApplication(args, _stylesheet); - + _application.Initialized += OnInitialized; _application.CreateNative += OnCreateNative; _application.Terminating += OnTerminated; @@ -164,7 +164,7 @@ namespace Tizen.NUI var handler = Handlers[EventType.Terminated] as Action; handler?.Invoke(); } - + } } diff --git a/src/Tizen.NUI/src/internal/NUICoreBackend.cs b/src/Tizen.NUI/src/internal/NUICoreBackend.cs index 76cce47..3ec90d6 100755 --- a/src/Tizen.NUI/src/internal/NUICoreBackend.cs +++ b/src/Tizen.NUI/src/internal/NUICoreBackend.cs @@ -101,7 +101,7 @@ namespace Tizen.NUI /// public void Dispose() { - if(_application != null) + if (_application != null) { _application.Dispose(); } @@ -112,7 +112,7 @@ namespace Tizen.NUI /// public void Exit() { - if(_application != null) + if (_application != null) { _application.Quit(); } @@ -158,11 +158,11 @@ namespace Tizen.NUI { if (_windowSize != null) { - _application = Application.NewApplication(args, _stylesheet, (Application.WindowMode)_windowMode, new Rectangle(_windowPosition.X, _windowPosition.Y, _windowSize.Width, _windowSize.Height)); + _application = Application.NewApplication(args, _stylesheet, (Application.WindowMode)_windowMode, new Rectangle(_windowPosition.X, _windowPosition.Y, _windowSize.Width, _windowSize.Height)); } else { - _application = Application.NewApplication(args, _stylesheet, (Application.WindowMode)_windowMode); + _application = Application.NewApplication(args, _stylesheet, (Application.WindowMode)_windowMode); } } @@ -190,7 +190,7 @@ namespace Tizen.NUI { Log.Info("NUI", "NUICorebackend OnRegionChanged Called"); var handler = Handlers[EventType.RegionFormatChanged] as Action; - handler?.Invoke( new RegionFormatChangedEventArgs((source as Application)?.GetRegion())); + handler?.Invoke(new RegionFormatChangedEventArgs((source as Application)?.GetRegion())); } /// @@ -203,23 +203,23 @@ namespace Tizen.NUI Log.Info("NUI", "NUICorebackend OnMemoryLow Called"); var handler = Handlers[EventType.LowMemory] as Action; - switch ( e.MemoryStatus ) + switch (e.MemoryStatus) { case Application.MemoryStatus.Normal: - { - handler?.Invoke( new LowMemoryEventArgs(LowMemoryStatus.None)); - break; - } + { + handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.None)); + break; + } case Application.MemoryStatus.Low: - { - handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.SoftWarning)); - break; - } + { + handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.SoftWarning)); + break; + } case Application.MemoryStatus.CriticallyLow: - { - handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.HardWarning)); - break; - } + { + handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.HardWarning)); + break; + } } } @@ -232,7 +232,7 @@ namespace Tizen.NUI { Log.Info("NUI", "NUICorebackend OnLanguageChanged Called"); var handler = Handlers[EventType.LocaleChanged] as Action; - handler?.Invoke( new LocaleChangedEventArgs((source as Application)?.GetLanguage())); + handler?.Invoke(new LocaleChangedEventArgs((source as Application)?.GetLanguage())); } /// @@ -244,23 +244,23 @@ namespace Tizen.NUI { Log.Info("NUI", "NUICorebackend OnBatteryLow Called"); var handler = Handlers[EventType.LowBattery] as Action; - switch( e.BatteryStatus ) + switch (e.BatteryStatus) { case Application.BatteryStatus.Normal: - { - handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.None)); - break; - } + { + handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.None)); + break; + } case Application.BatteryStatus.CriticallyLow: - { - handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.CriticalLow)); - break; - } + { + handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.CriticalLow)); + break; + } case Application.BatteryStatus.PowerOff: - { - handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.PowerOff)); - break; - } + { + handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.PowerOff)); + break; + } } } @@ -313,8 +313,8 @@ namespace Tizen.NUI { Log.Info("NUI", "NUICorebackend OnAppControl Called"); var handler = Handlers[EventType.AppControlReceived] as Action; - SafeAppControlHandle handle = new SafeAppControlHandle(e.VoidP,false); - handler?.Invoke( new AppControlReceivedEventArgs(new ReceivedAppControl(handle)) ); + SafeAppControlHandle handle = new SafeAppControlHandle(e.VoidP, false); + handler?.Invoke(new AppControlReceivedEventArgs(new ReceivedAppControl(handle))); } /// diff --git a/src/Tizen.NUI/src/internal/NUIWidgetCoreBackend.cs b/src/Tizen.NUI/src/internal/NUIWidgetCoreBackend.cs index 69828cc..73eacd8 100755 --- a/src/Tizen.NUI/src/internal/NUIWidgetCoreBackend.cs +++ b/src/Tizen.NUI/src/internal/NUIWidgetCoreBackend.cs @@ -106,7 +106,7 @@ namespace Tizen.NUI { if (_application != null) { - _application.AddWidgetInfo( widgetInfo ); + _application.AddWidgetInfo(widgetInfo); } } @@ -192,20 +192,20 @@ namespace Tizen.NUI switch (e.MemoryStatus) { case Application.MemoryStatus.Normal: - { - handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.None)); - break; - } + { + handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.None)); + break; + } case Application.MemoryStatus.Low: - { - handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.SoftWarning)); - break; - } + { + handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.SoftWarning)); + break; + } case Application.MemoryStatus.CriticallyLow: - { - handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.HardWarning)); - break; - } + { + handler?.Invoke(new LowMemoryEventArgs(LowMemoryStatus.HardWarning)); + break; + } } } @@ -220,20 +220,20 @@ namespace Tizen.NUI switch (e.BatteryStatus) { case Application.BatteryStatus.Normal: - { - handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.None)); - break; - } + { + handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.None)); + break; + } case Application.BatteryStatus.CriticallyLow: - { - handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.CriticalLow)); - break; - } + { + handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.CriticalLow)); + break; + } case Application.BatteryStatus.PowerOff: - { - handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.PowerOff)); - break; - } + { + handler?.Invoke(new LowBatteryEventArgs(LowBatteryStatus.PowerOff)); + break; + } } } diff --git a/src/Tizen.NUI/src/internal/Object.cs b/src/Tizen.NUI/src/internal/Object.cs index b452a43..90ef956 100755 --- a/src/Tizen.NUI/src/internal/Object.cs +++ b/src/Tizen.NUI/src/internal/Object.cs @@ -26,7 +26,7 @@ namespace Tizen.NUI { public static PropertyValue GetProperty(global::System.Runtime.InteropServices.HandleRef handle, int index) { - if(handle.Handle == System.IntPtr.Zero) + if (handle.Handle == System.IntPtr.Zero) { throw new System.InvalidOperationException("Error! NUI's native dali object is already disposed. OR the native dali object handle of NUI becomes null!"); } diff --git a/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs b/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs index aa81c15..27b7be8 100755 --- a/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnLandscapeView.cs @@ -54,7 +54,7 @@ namespace Tizen.NUI public new static PageTurnLandscapeView DownCast(BaseHandle handle) { - PageTurnLandscapeView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PageTurnLandscapeView; + PageTurnLandscapeView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PageTurnLandscapeView; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs b/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs index cb739b3..450fd67 100755 --- a/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnPortraitView.cs @@ -53,7 +53,7 @@ namespace Tizen.NUI public new static PageTurnPortraitView DownCast(BaseHandle handle) { - PageTurnPortraitView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PageTurnPortraitView; + PageTurnPortraitView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PageTurnPortraitView; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/PageTurnView.cs b/src/Tizen.NUI/src/internal/PageTurnView.cs index 752da98..c809ce1 100755 --- a/src/Tizen.NUI/src/internal/PageTurnView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnView.cs @@ -416,7 +416,7 @@ namespace Tizen.NUI public static PageTurnView DownCast(BaseHandle handle) { - PageTurnView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PageTurnView; + PageTurnView ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PageTurnView; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/PathConstrainer.cs b/src/Tizen.NUI/src/internal/PathConstrainer.cs index fa19836..2e9a55c 100755 --- a/src/Tizen.NUI/src/internal/PathConstrainer.cs +++ b/src/Tizen.NUI/src/internal/PathConstrainer.cs @@ -48,7 +48,7 @@ namespace Tizen.NUI } public static PathConstrainer DownCast(BaseHandle handle) { - PathConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PathConstrainer; + PathConstrainer ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as PathConstrainer; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/Registry.cs b/src/Tizen.NUI/src/internal/Registry.cs index a4941bf..2023bac 100755 --- a/src/Tizen.NUI/src/internal/Registry.cs +++ b/src/Tizen.NUI/src/internal/Registry.cs @@ -152,7 +152,7 @@ namespace Tizen.NUI private static void RegistryCurrentThreadCheck() { - + if (savedApplicationThread == null) { Tizen.Log.Fatal("NUI", $"Error! maybe main thread is created by other process\n"); diff --git a/src/Tizen.NUI/src/internal/RenderTask.cs b/src/Tizen.NUI/src/internal/RenderTask.cs index c355e62..7f62c63 100755 --- a/src/Tizen.NUI/src/internal/RenderTask.cs +++ b/src/Tizen.NUI/src/internal/RenderTask.cs @@ -152,7 +152,7 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] public static RenderTask DownCast(BaseHandle handle) { - RenderTask ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as RenderTask; + RenderTask ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as RenderTask; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/RenderTaskList.cs b/src/Tizen.NUI/src/internal/RenderTaskList.cs index 1ad5381..5f23139 100755 --- a/src/Tizen.NUI/src/internal/RenderTaskList.cs +++ b/src/Tizen.NUI/src/internal/RenderTaskList.cs @@ -41,7 +41,7 @@ namespace Tizen.NUI public static RenderTaskList DownCast(BaseHandle handle) { - RenderTaskList ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as RenderTaskList; + RenderTaskList ret = Registry.GetManagedBaseHandleFromNativePtr(handle) as RenderTaskList; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } diff --git a/src/Tizen.NUI/src/internal/Ruler.cs b/src/Tizen.NUI/src/internal/Ruler.cs index b4e7a39..400cab4 100755 --- a/src/Tizen.NUI/src/internal/Ruler.cs +++ b/src/Tizen.NUI/src/internal/Ruler.cs @@ -37,7 +37,7 @@ namespace Tizen.NUI [EditorBrowsable(EditorBrowsableState.Never)] protected override void ReleaseSwigCPtr(System.Runtime.InteropServices.HandleRef swigCPtr) { - throw new global::System.MethodAccessException("C++ destructor does not have public access"); + throw new global::System.MethodAccessException("C++ destructor does not have public access"); } /// This will be public opened in next tizen after ACR done. Before ACR, need to be hidden as inhouse API. diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs index de135db..72df459 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_bundle.cs @@ -24,7 +24,7 @@ namespace Tizen.NUI /// This should be internal, please do not use. /// /// 4 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please do not use!" + "IntPtr(native integer pointer) is supposed to be not used in Application!")] [EditorBrowsable(EditorBrowsableState.Never)] diff --git a/src/Tizen.NUI/src/internal/SWIGTYPE_p_tm.cs b/src/Tizen.NUI/src/internal/SWIGTYPE_p_tm.cs index 122c7e3..18e4c60 100755 --- a/src/Tizen.NUI/src/internal/SWIGTYPE_p_tm.cs +++ b/src/Tizen.NUI/src/internal/SWIGTYPE_p_tm.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + namespace Tizen.NUI { internal class SWIGTYPE_p_tm diff --git a/src/Tizen.NUI/src/internal/VersionCheck.cs b/src/Tizen.NUI/src/internal/VersionCheck.cs index bad7ce7..6c961fb 100755 --- a/src/Tizen.NUI/src/internal/VersionCheck.cs +++ b/src/Tizen.NUI/src/internal/VersionCheck.cs @@ -31,10 +31,10 @@ namespace Tizen.NUI public const int nuiAPIVer = 505; public const int reservedVer1 = 0; public const int reservedVer2 = 0; - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_Dali_NativeVersionCheck")] public static extern bool NativeVersionCheck(ref int ver1, ref int ver2, ref int ver3); - + [global::System.Runtime.InteropServices.DllImport(NDalicPINVOKE.Lib, EntryPoint = "CSharp_NUI_InternalAPIVersionCheck")] public static extern bool InternalAPIVersionCheck(ref int ver1, ref int ver2, ref int ver3); diff --git a/src/Tizen.NUI/src/internal/VideoViewSignal.cs b/src/Tizen.NUI/src/internal/VideoViewSignal.cs index 11d4e01..a72f976 100755 --- a/src/Tizen.NUI/src/internal/VideoViewSignal.cs +++ b/src/Tizen.NUI/src/internal/VideoViewSignal.cs @@ -17,7 +17,8 @@ using Tizen.NUI.BaseComponents; -namespace Tizen.NUI { +namespace Tizen.NUI +{ internal class VideoViewSignal : Disposable { diff --git a/src/Tizen.NUI/src/internal/WatchApplication.cs b/src/Tizen.NUI/src/internal/WatchApplication.cs index 30a0e4a..c8bfb41 100755 --- a/src/Tizen.NUI/src/internal/WatchApplication.cs +++ b/src/Tizen.NUI/src/internal/WatchApplication.cs @@ -14,7 +14,7 @@ * limitations under the License. * */ - + using System; using System.Runtime.InteropServices; @@ -140,7 +140,7 @@ namespace Tizen.NUI [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate void TimeTickCallbackType(IntPtr application, IntPtr watchTime); private TimeTickCallbackType _timeTickCallback; - private DaliEventHandler _timeTickEventHandler; + private DaliEventHandler _timeTickEventHandler; /// /// TimeTick event. @@ -151,7 +151,7 @@ namespace Tizen.NUI { if (_timeTickEventHandler == null) { - _timeTickCallback = new TimeTickCallbackType( OnTimeTick); + _timeTickCallback = new TimeTickCallbackType(OnTimeTick); TimeTickSignal().Connect(_timeTickCallback); } @@ -164,7 +164,7 @@ namespace Tizen.NUI if (_timeTickEventHandler == null && TimeTickSignal().Empty() == false) { - TimeTickSignal().Disconnect(_timeTickCallback); + TimeTickSignal().Disconnect(_timeTickCallback); } } } @@ -216,7 +216,7 @@ namespace Tizen.NUI [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate void AmbientTickCallbackType(IntPtr application, IntPtr watchTime); private AmbientTickCallbackType _ambientTickCallback; - private DaliEventHandler _ambientTickEventHandler; + private DaliEventHandler _ambientTickEventHandler; /// /// AmbientTick event. @@ -227,7 +227,7 @@ namespace Tizen.NUI { if (_ambientTickEventHandler == null) { - _ambientTickCallback = new AmbientTickCallbackType( OnAmbientTick); + _ambientTickCallback = new AmbientTickCallbackType(OnAmbientTick); AmbientTickSignal().Connect(_ambientTickCallback); } @@ -240,7 +240,7 @@ namespace Tizen.NUI if (_ambientTickEventHandler == null && AmbientTickSignal().Empty() == false) { - AmbientTickSignal().Disconnect(_ambientTickCallback); + AmbientTickSignal().Disconnect(_ambientTickCallback); } } } @@ -291,7 +291,7 @@ namespace Tizen.NUI [UnmanagedFunctionPointer(CallingConvention.StdCall)] private delegate void AmbientChangedCallbackType(IntPtr application, bool changed); private AmbientChangedCallbackType _ambientChangedCallback; - private DaliEventHandler _ambientChangedEventHandler; + private DaliEventHandler _ambientChangedEventHandler; /// /// AmbientChanged event. @@ -302,7 +302,7 @@ namespace Tizen.NUI { if (_ambientChangedEventHandler == null) { - _ambientChangedCallback = new AmbientChangedCallbackType( OnAmbientChanged); + _ambientChangedCallback = new AmbientChangedCallbackType(OnAmbientChanged); AmbientChangedSignal().Connect(_ambientChangedCallback); } @@ -315,7 +315,7 @@ namespace Tizen.NUI if (_ambientChangedEventHandler == null && AmbientChangedSignal().Empty() == false) { - AmbientChangedSignal().Disconnect(_ambientChangedCallback); + AmbientChangedSignal().Disconnect(_ambientChangedCallback); } } } diff --git a/src/Tizen.NUI/src/internal/WidgetApplication.cs b/src/Tizen.NUI/src/internal/WidgetApplication.cs index 870caa8..8c565ec 100755 --- a/src/Tizen.NUI/src/internal/WidgetApplication.cs +++ b/src/Tizen.NUI/src/internal/WidgetApplication.cs @@ -97,7 +97,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void AddWidgetInstance( Widget widget ) + public void AddWidgetInstance(Widget widget) { _widgetList.Add(widget); } @@ -109,11 +109,11 @@ namespace Tizen.NUI public void AddWidgetInfo(Dictionary newWidgetInfo) { - foreach (KeyValuePair widgetInfo in newWidgetInfo ) + foreach (KeyValuePair widgetInfo in newWidgetInfo) { - if ( _widgetInfo.ContainsKey(widgetInfo.Key) == false ) + if (_widgetInfo.ContainsKey(widgetInfo.Key) == false) { - _widgetInfo.Add(widgetInfo.Key, widgetInfo.Value ); + _widgetInfo.Add(widgetInfo.Key, widgetInfo.Value); string widgetName = widgetInfo.Value; RegisterWidgetCreatingFunction(ref widgetName); } diff --git a/src/Tizen.NUI/src/internal/WidgetImpl.cs b/src/Tizen.NUI/src/internal/WidgetImpl.cs index d548d6d..18a20c6 100755 --- a/src/Tizen.NUI/src/internal/WidgetImpl.cs +++ b/src/Tizen.NUI/src/internal/WidgetImpl.cs @@ -23,7 +23,7 @@ namespace Tizen.NUI internal class WidgetImpl : BaseObject { - internal WidgetImpl() : this( Interop.WidgetImpl.WidgetImpl_New(), true ) + internal WidgetImpl() : this(Interop.WidgetImpl.WidgetImpl_New(), true) { SwigDirectorConnect(); } @@ -240,7 +240,7 @@ namespace Tizen.NUI WIdgetInstanceOnDestroyArgs args = new WIdgetInstanceOnDestroyArgs(); args.ContentInfo = contentInfo; args.TerminateType = type; - _widgetInstanceOnDestroyEventHandler?.Invoke(this,args); + _widgetInstanceOnDestroyEventHandler?.Invoke(this, args); } public virtual void OnPause() diff --git a/src/Tizen.NUI/src/internal/WidgetViewSignal.cs b/src/Tizen.NUI/src/internal/WidgetViewSignal.cs index 05ef5a3..8ba5a11 100755 --- a/src/Tizen.NUI/src/internal/WidgetViewSignal.cs +++ b/src/Tizen.NUI/src/internal/WidgetViewSignal.cs @@ -24,7 +24,7 @@ namespace Tizen.NUI /// WidgetViewSignal /// /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public class WidgetViewSignal : Disposable @@ -47,7 +47,7 @@ namespace Tizen.NUI /// /// True if there are any slots connected to the signal /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public bool Empty() @@ -62,7 +62,7 @@ namespace Tizen.NUI /// /// The number of slots connected to this signal /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public uint GetConnectionCount() @@ -77,7 +77,7 @@ namespace Tizen.NUI /// /// The function to connect /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public void Connect(System.Delegate func) @@ -94,7 +94,7 @@ namespace Tizen.NUI /// /// The function to disconnect /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public void Disconnect(System.Delegate func) @@ -111,7 +111,7 @@ namespace Tizen.NUI /// /// The member function to connect /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public void Emit(WidgetView arg) @@ -124,7 +124,7 @@ namespace Tizen.NUI /// The contructor. /// /// 3 - [Obsolete("Deprecated in API6, Will be removed in API9, " + + [Obsolete("Deprecated in API6, Will be removed in API9, " + "Please use WidgetView.WidgetAdded, WidgetDeleted events instead!")] [EditorBrowsable(EditorBrowsableState.Never)] public WidgetViewSignal() : this(Interop.WidgetView.new_WidgetViewSignal(), true) diff --git a/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs index 15315c3..770fc51 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs +++ b/src/Tizen.NUI/src/internal/Xaml/ApplyPropertiesVisitor.cs @@ -42,11 +42,12 @@ namespace Tizen.NUI.Xaml public void Visit(ValueNode node, INode parentNode) { var parentElement = parentNode as IElementNode; - var value = Values [node]; - var source = Values [parentNode]; + var value = Values[node]; + var source = Values[parentNode]; XmlName propertyName; - if (TryGetPropertyName(node, parentNode, out propertyName)) { + if (TryGetPropertyName(node, parentNode, out propertyName)) + { if (TrySetRuntimeName(propertyName, source, value, node)) return; if (Skips.Contains(propertyName)) @@ -56,10 +57,13 @@ namespace Tizen.NUI.Xaml if (propertyName.Equals(XamlParser.McUri, "Ignorable")) return; SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node); - } else if (IsCollectionItem(node, parentNode) && parentNode is IElementNode) { + } + else if (IsCollectionItem(node, parentNode) && parentNode is IElementNode) + { // Collection element, implicit content, or implicit collection element. var contentProperty = GetContentPropertyName(Context.Types[parentElement].GetTypeInfo()); - if (contentProperty != null) { + if (contentProperty != null) + { var name = new XmlName(((ElementNode)parentNode).NamespaceURI, contentProperty); if (Skips.Contains(name)) return; @@ -77,9 +81,11 @@ namespace Tizen.NUI.Xaml public void Visit(ElementNode node, INode parentNode) { XmlName propertyName; - if (TryGetPropertyName(node, parentNode, out propertyName) && propertyName == XmlName._CreateContent) { + if (TryGetPropertyName(node, parentNode, out propertyName) && propertyName == XmlName._CreateContent) + { var s0 = Values[parentNode]; - if (s0 is ElementTemplate) { + if (s0 is ElementTemplate) + { SetTemplate(s0 as ElementTemplate, node); return; } @@ -90,7 +96,8 @@ namespace Tizen.NUI.Xaml //Simplify ListNodes with single elements var pList = parentNode as ListNode; - if (pList != null && pList.CollectionItems.Count == 1) { + if (pList != null && pList.CollectionItems.Count == 1) + { propertyName = pList.XmlName; parentNode = parentNode.Parent; parentElement = parentNode as IElementNode; @@ -98,7 +105,8 @@ namespace Tizen.NUI.Xaml var value = Values[node]; - if (propertyName != XmlName.Empty || TryGetPropertyName(node, parentNode, out propertyName)) { + if (propertyName != XmlName.Empty || TryGetPropertyName(node, parentNode, out propertyName)) + { if (Skips.Contains(propertyName)) return; if (parentElement == null) @@ -110,7 +118,8 @@ namespace Tizen.NUI.Xaml ProvideValue(ref value, node, source, propertyName); SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node); } - else if (IsCollectionItem(node, parentNode) && parentNode is IElementNode) { + else if (IsCollectionItem(node, parentNode) && parentNode is IElementNode) + { var source = Values[parentNode]; ProvideValue(ref value, node, source, XmlName.Empty); string contentProperty; @@ -120,7 +129,7 @@ namespace Tizen.NUI.Xaml //ResourceDictionary if (xpe == null && TryAddToResourceDictionary(source as ResourceDictionary, value, xKey, node, out xpe)) return; - + // Dictionary with string key if (xpe == null && xKey != null) { @@ -133,7 +142,8 @@ namespace Tizen.NUI.Xaml } // Collection element, implicit content, or implicit collection element. - if (xpe == null && typeof(IEnumerable).IsAssignableFrom(Context.Types[parentElement]) && Context.Types[parentElement].GetRuntimeMethods().Any(mi => mi.Name == "Add" && mi.GetParameters().Length == 1)) { + if (xpe == null && typeof(IEnumerable).IsAssignableFrom(Context.Types[parentElement]) && Context.Types[parentElement].GetRuntimeMethods().Any(mi => mi.Name == "Add" && mi.GetParameters().Length == 1)) + { var addMethod = Context.Types[parentElement].GetRuntimeMethods().First(mi => mi.Name == "Add" && mi.GetParameters().Length == 1); @@ -147,7 +157,8 @@ namespace Tizen.NUI.Xaml if (addMethod != null) addMethod.Invoke(source, new[] { value }); return; } - if (xpe == null && (contentProperty = GetContentPropertyName(Context.Types[parentElement].GetTypeInfo())) != null) { + if (xpe == null && (contentProperty = GetContentPropertyName(Context.Types[parentElement].GetTypeInfo())) != null) + { var name = new XmlName(node.NamespaceURI, contentProperty); if (Skips.Contains(name)) return; @@ -156,14 +167,15 @@ namespace Tizen.NUI.Xaml SetPropertyValue(source, name, value, Context.RootElement, node, Context, node); return; - } - + } + xpe = xpe ?? new XamlParseException($"Can not set the content of {((IElementNode)parentNode).XmlType.Name} as it doesn't have a ContentPropertyAttribute", node); if (Context.ExceptionHandler != null) Context.ExceptionHandler(xpe); throw xpe; } - else if (IsCollectionItem(node, parentNode) && parentNode is ListNode) { + else if (IsCollectionItem(node, parentNode) && parentNode is ListNode) + { var source = Values[parentNode.Parent]; ProvideValue(ref value, node, source, XmlName.Empty); var parentList = (ListNode)parentNode; @@ -181,7 +193,8 @@ namespace Tizen.NUI.Xaml return; MethodInfo addMethod; - if (xpe == null && (addMethod = collection.GetType().GetRuntimeMethods().First(mi => mi.Name == "Add" && mi.GetParameters().Length == 1)) != null) { + if (xpe == null && (addMethod = collection.GetType().GetRuntimeMethods().First(mi => mi.Name == "Add" && mi.GetParameters().Length == 1)) != null) + { addMethod.Invoke(collection, new[] { Values[node] }); return; } @@ -193,7 +206,7 @@ namespace Tizen.NUI.Xaml } } - + public void Visit(RootNode node, INode parentNode) { @@ -209,7 +222,8 @@ namespace Tizen.NUI.Xaml var parentElement = parentNode as IElementNode; if (parentElement == null) return false; - foreach (var kvp in parentElement.Properties) { + foreach (var kvp in parentElement.Properties) + { if (kvp.Value != node) continue; name = kvp.Key; @@ -228,7 +242,8 @@ namespace Tizen.NUI.Xaml internal static string GetContentPropertyName(System.Reflection.TypeInfo typeInfo) { - while (typeInfo != null) { + while (typeInfo != null) + { var propName = GetContentPropertyName(typeInfo.CustomAttributes); if (propName != null) return propName; @@ -249,7 +264,8 @@ namespace Tizen.NUI.Xaml if (value.GetType().GetTypeInfo().GetCustomAttribute() == null) serviceProvider = new XamlServiceProvider(node, Context); - if (serviceProvider != null && serviceProvider.IProvideValueTarget is XamlValueTargetProvider && propertyName != XmlName.Empty) { + if (serviceProvider != null && serviceProvider.IProvideValueTarget is XamlValueTargetProvider && propertyName != XmlName.Empty) + { (serviceProvider.IProvideValueTarget as XamlValueTargetProvider).TargetProperty = GetTargetProperty(source, propertyName, Context, node); } @@ -265,8 +281,8 @@ namespace Tizen.NUI.Xaml attributes.FirstOrDefault(cad => ContentPropertyAttribute.ContentPropertyTypes.Contains(cad.AttributeType.FullName)); if (contentAttribute == null || contentAttribute.ConstructorArguments.Count != 1) return null; - if (contentAttribute.ConstructorArguments [0].ArgumentType == typeof(string)) - return (string)contentAttribute.ConstructorArguments [0].Value; + if (contentAttribute.ConstructorArguments[0].ArgumentType == typeof(string)) + return (string)contentAttribute.ConstructorArguments[0].Value; return null; } @@ -274,7 +290,8 @@ namespace Tizen.NUI.Xaml HydrationContext context, IXmlLineInfo lineInfo) { var dotIdx = localname.IndexOf('.'); - if (dotIdx > 0) { + if (dotIdx > 0) + { var typename = localname.Substring(0, dotIdx); localname = localname.Substring(dotIdx + 1); XamlParseException xpe; @@ -294,7 +311,7 @@ namespace Tizen.NUI.Xaml #if NETSTANDARD1_0 var bindableFieldInfo = elementType.GetFields().FirstOrDefault(fi => fi.Name == localName + "Property"); #else - var bindableFieldInfo = elementType.GetFields(BindingFlags.Static | BindingFlags.NonPublic|BindingFlags.FlattenHierarchy).FirstOrDefault(fi => fi.Name == localName + "Property"); + var bindableFieldInfo = elementType.GetFields(BindingFlags.Static | BindingFlags.NonPublic | BindingFlags.FlattenHierarchy).FirstOrDefault(fi => fi.Name == localName + "Property"); if (null == bindableFieldInfo) { @@ -302,7 +319,8 @@ namespace Tizen.NUI.Xaml } #endif Exception exception = null; - if (exception == null && bindableFieldInfo == null) { + if (exception == null && bindableFieldInfo == null) + { exception = new XamlParseException( Format("BindableProperty {0} not found on {1}", localName + "Property", elementType.Name), lineInfo); @@ -325,7 +343,7 @@ namespace Tizen.NUI.Xaml if (property != null) return property; - + var elementType = xamlelement.GetType(); var propertyInfo = elementType.GetRuntimeProperties().FirstOrDefault(p => p.Name == localName); return propertyInfo; @@ -420,15 +438,19 @@ namespace Tizen.NUI.Xaml return false; var methodInfo = rootElement.GetType().GetRuntimeMethods().FirstOrDefault(mi => mi.Name == (string)value); - if (methodInfo == null) { + if (methodInfo == null) + { exception = new XamlParseException($"No method {value} found on type {rootElement.GetType()}", lineInfo); return false; } - try { + try + { eventInfo.AddEventHandler(element, methodInfo.CreateDelegate(eventInfo.EventHandlerType, rootElement)); return true; - } catch (ArgumentException ae) { + } + catch (ArgumentException ae) + { exception = new XamlParseException($"Method {stringValue} does not have the correct signature", lineInfo, ae); } return false; @@ -445,7 +467,8 @@ namespace Tizen.NUI.Xaml if (dynamicResource == null || property == null) return false; - if (bindable == null) { + if (bindable == null) + { exception = new XamlParseException($"{elementType.Name} is not a BindableObject", lineInfo); return false; } @@ -459,13 +482,14 @@ namespace Tizen.NUI.Xaml exception = null; var elementType = element.GetType(); - var binding = value.ConvertTo(typeof(BindingBase),pinfoRetriever:null,serviceProvider:null) as BindingBase; + var binding = value.ConvertTo(typeof(BindingBase), pinfoRetriever: null, serviceProvider: null) as BindingBase; var bindable = element as BindableObject; if (binding == null) return false; - if (bindable != null && property != null) { + if (bindable != null && property != null) + { bindable.SetBinding(property, binding); return true; } @@ -491,7 +515,7 @@ namespace Tizen.NUI.Xaml Func minforetriever; if (attached) - minforetriever = () => property.DeclaringType.GetRuntimeMethod("Get" + property.PropertyName, new [] { typeof(BindableObject) }); + minforetriever = () => property.DeclaringType.GetRuntimeMethod("Get" + property.PropertyName, new[] { typeof(BindableObject) }); else { minforetriever = () => property.DeclaringType.GetRuntimeProperties().LastOrDefault(p => p.Name == property.PropertyName); @@ -499,12 +523,14 @@ namespace Tizen.NUI.Xaml //minforetriever = () => property.DeclaringType.GetRuntimeProperty(property.PropertyName); var convertedValue = value.ConvertTo(property.ReturnType, minforetriever, serviceProvider); - if (bindable != null) { + if (bindable != null) + { //SetValue doesn't throw on mismatching type, so check before to get a chance to try the property setting or the collection adding var nullable = property.ReturnTypeInfo.IsGenericType && property.ReturnTypeInfo.GetGenericTypeDefinition() == typeof(Nullable<>); if ((convertedValue == null && (!property.ReturnTypeInfo.IsValueType || nullable)) || - (property.ReturnType.IsInstanceOfType(convertedValue))) { + (property.ReturnType.IsInstanceOfType(convertedValue))) + { bindable.SetValue(property, convertedValue); return true; } @@ -609,11 +635,15 @@ namespace Tizen.NUI.Xaml value = null; var elementType = element.GetType(); PropertyInfo propertyInfo = null; - try { + try + { propertyInfo = elementType.GetRuntimeProperty(localName); - } catch (AmbiguousMatchException) { + } + catch (AmbiguousMatchException) + { // Get most derived instance of property - foreach (var property in elementType.GetRuntimeProperties().Where(prop => prop.Name == localName)) { + foreach (var property in elementType.GetRuntimeProperties().Where(prop => prop.Name == localName)) + { if (propertyInfo == null || propertyInfo.DeclaringType.IsAssignableFrom(property.DeclaringType)) propertyInfo = property; } @@ -666,7 +696,7 @@ namespace Tizen.NUI.Xaml if (serviceProvider != null && serviceProvider.IProvideValueTarget != null) ((XamlValueTargetProvider)serviceProvider.IProvideValueTarget).TargetProperty = targetProperty; - addMethod.Invoke(collection, new [] { value.ConvertTo(addMethod.GetParameters() [0].ParameterType, (Func)null, serviceProvider) }); + addMethod.Invoke(collection, new[] { value.ConvertTo(addMethod.GetParameters()[0].ParameterType, (Func)null, serviceProvider) }); return true; } @@ -685,7 +715,8 @@ namespace Tizen.NUI.Xaml resourceDictionary.Add((ResourceDictionary)value); else if (value is StyleSheets.StyleSheet) resourceDictionary.Add((StyleSheets.StyleSheet)value); - else { + else + { exception = new XamlParseException("resources in ResourceDictionary require a x:Key attribute", lineInfo); return false; } @@ -695,7 +726,8 @@ namespace Tizen.NUI.Xaml void SetTemplate(ElementTemplate dt, INode node) { #pragma warning disable 0612 - ((IDataTemplate)dt).LoadTemplate = () => { + ((IDataTemplate)dt).LoadTemplate = () => + { #pragma warning restore 0612 var cnode = node.Clone(); var context = new HydrationContext { ParentContext = Context, RootElement = Context.RootElement }; @@ -706,17 +738,19 @@ namespace Tizen.NUI.Xaml cnode.Accept(new RegisterXNamesVisitor(context), null); cnode.Accept(new FillResourceDictionariesVisitor(context), null); cnode.Accept(new ApplyPropertiesVisitor(context, true), null); - return context.Values [cnode]; + return context.Values[cnode]; }; } static bool TryAddValue(BindableObject bindable, BindableProperty property, object value, XamlServiceProvider serviceProvider) { - if(property?.ReturnTypeInfo?.GenericTypeArguments == null){ + if (property?.ReturnTypeInfo?.GenericTypeArguments == null) + { return false; } - if(property.ReturnType == null){ + if (property.ReturnType == null) + { return false; } @@ -732,7 +766,7 @@ namespace Tizen.NUI.Xaml // If there's an add method, get the collection var collection = bindable.GetValue(property); - + // And add the new value to it addMethod.Invoke(collection, new[] { value.ConvertTo(addMethod.GetParameters()[0].ParameterType, (Func)null, serviceProvider) }); return true; @@ -757,6 +791,6 @@ namespace Tizen.NUI.Xaml return true; } - private PropertyInfo GetIndexer(object source, Type keyType, Type valueType) => source.GetType().GetProperties(BindingFlags.Instance|BindingFlags.Public|BindingFlags.NonPublic).FirstOrDefault(p => p.Name == "Item" && p.PropertyType.IsAssignableFrom(valueType) && p.GetIndexParameters().Length != 0 && p.GetIndexParameters()[0].ParameterType == keyType); + private PropertyInfo GetIndexer(object source, Type keyType, Type valueType) => source.GetType().GetProperties(BindingFlags.Instance | BindingFlags.Public | BindingFlags.NonPublic).FirstOrDefault(p => p.Name == "Item" && p.PropertyType.IsAssignableFrom(valueType) && p.GetIndexParameters().Length != 0 && p.GetIndexParameters()[0].ParameterType == keyType); } } diff --git a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs index 9b8f3bc..d9e91e3 100755 --- a/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs +++ b/src/Tizen.NUI/src/internal/Xaml/CreateValuesVisitor.cs @@ -63,7 +63,7 @@ namespace Tizen.NUI.Xaml .DeclaredConstructors.Any( ci => ci.IsPublic && ci.GetParameters().Length != 0 && - ci.GetParameters().All(pi => pi.CustomAttributes.Any(attr => attr.AttributeType == typeof (ParameterAttribute)))) && + ci.GetParameters().All(pi => pi.CustomAttributes.Any(attr => attr.AttributeType == typeof(ParameterAttribute)))) && ValidateCtorArguments(type, node, out ctorargname)) value = CreateFromParameterizedConstructor(type, node); else if (!type.GetTypeInfo().DeclaredConstructors.Any(ci => ci.IsPublic && ci.GetParameters().Length == 0) && @@ -76,9 +76,9 @@ namespace Tizen.NUI.Xaml //this is a trick as the DataTemplate parameterless ctor is internal, and we can't CreateInstance(..., false) on WP7 try { - if (type == typeof (DataTemplate)) + if (type == typeof(DataTemplate)) value = new DataTemplate(); - if (type == typeof (ControlTemplate)) + if (type == typeof(ControlTemplate)) value = new ControlTemplate(); if (value == null && node.CollectionItems.Any() && node.CollectionItems.First() is ValueNode) { @@ -180,7 +180,7 @@ namespace Tizen.NUI.Xaml .DeclaredConstructors.FirstOrDefault( ci => ci.GetParameters().Length != 0 && ci.IsPublic && - ci.GetParameters().All(pi => pi.CustomAttributes.Any(attr => attr.AttributeType == typeof (ParameterAttribute)))); + ci.GetParameters().All(pi => pi.CustomAttributes.Any(attr => attr.AttributeType == typeof(ParameterAttribute)))); if (ctorInfo == null) return true; foreach (var parameter in ctorInfo.GetParameters()) @@ -207,7 +207,7 @@ namespace Tizen.NUI.Xaml .DeclaredConstructors.FirstOrDefault( ci => ci.GetParameters().Length != 0 && ci.IsPublic && - ci.GetParameters().All(pi => pi.CustomAttributes.Any(attr => attr.AttributeType == typeof (ParameterAttribute)))); + ci.GetParameters().All(pi => pi.CustomAttributes.Any(attr => attr.AttributeType == typeof(ParameterAttribute)))); object[] arguments = CreateArgumentsArray(node, ctorInfo); if (arguments != null) @@ -245,7 +245,8 @@ namespace Tizen.NUI.Xaml var factoryMethod = ((string)((ValueNode)node.Properties[XmlName.xFactoryMethod]).Value); Type[] types = arguments == null ? new Type[0] : arguments.Select(a => a.GetType()).ToArray(); - Func isMatch = m => { + Func isMatch = m => + { if (m.Name != factoryMethod) return false; var p = m.GetParameters(); @@ -253,15 +254,16 @@ namespace Tizen.NUI.Xaml return false; if (!m.IsStatic) return false; - for (var i = 0; i < p.Length; i++) { - if ((p [i].ParameterType.IsAssignableFrom(types [i]))) + for (var i = 0; i < p.Length; i++) + { + if ((p[i].ParameterType.IsAssignableFrom(types[i]))) continue; - var op_impl = p[i].ParameterType.GetImplicitConversionOperator(fromType: types[i], toType: p[i].ParameterType) + var op_impl = p[i].ParameterType.GetImplicitConversionOperator(fromType: types[i], toType: p[i].ParameterType) ?? types[i].GetImplicitConversionOperator(fromType: types[i], toType: p[i].ParameterType); if (op_impl == null) return false; - arguments [i] = op_impl.Invoke(null, new [] { arguments [i]}); + arguments[i] = op_impl.Invoke(null, new[] { arguments[i] }); } return true; }; @@ -303,7 +305,7 @@ namespace Tizen.NUI.Xaml public object[] CreateArgumentsArray(IElementNode enode, ConstructorInfo ctorInfo) { - if( ctorInfo != null ) + if (ctorInfo != null) { var n = ctorInfo.GetParameters().Length; var array = new object[n]; @@ -311,7 +313,7 @@ namespace Tizen.NUI.Xaml { var parameter = ctorInfo.GetParameters()[i]; var propname = - parameter?.CustomAttributes?.First(attr => attr.AttributeType == typeof (ParameterAttribute))? + parameter?.CustomAttributes?.First(attr => attr.AttributeType == typeof(ParameterAttribute))? .ConstructorArguments.First() .Value as string; var name = new XmlName("", propname); @@ -376,83 +378,94 @@ namespace Tizen.NUI.Xaml { var valuestring = ((ValueNode)node.CollectionItems[0]).Value as string; - if (nodeType == typeof(SByte)) { + if (nodeType == typeof(SByte)) + { sbyte retval; if (sbyte.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(Int16)) { + if (nodeType == typeof(Int16)) + { short retval; if (short.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(Int32)) { + if (nodeType == typeof(Int32)) + { int retval; if (int.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(Int64)) { + if (nodeType == typeof(Int64)) + { long retval; if (long.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(Byte)) { + if (nodeType == typeof(Byte)) + { byte retval; if (byte.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(UInt16)) { + if (nodeType == typeof(UInt16)) + { ushort retval; if (ushort.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(UInt32)) { + if (nodeType == typeof(UInt32)) + { uint retval; if (uint.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(UInt64)) { + if (nodeType == typeof(UInt64)) + { ulong retval; if (ulong.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(Single)) { + if (nodeType == typeof(Single)) + { float retval; if (float.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof(Double)) { + if (nodeType == typeof(Double)) + { double retval; if (double.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof (Boolean)) + if (nodeType == typeof(Boolean)) { bool outbool; if (bool.TryParse(valuestring, out outbool)) return outbool; } - if (nodeType == typeof(TimeSpan)) { + if (nodeType == typeof(TimeSpan)) + { TimeSpan retval; if (TimeSpan.TryParse(valuestring, CultureInfo.InvariantCulture, out retval)) return retval; } - if (nodeType == typeof (char)) + if (nodeType == typeof(char)) { char retval; if (char.TryParse(valuestring, out retval)) return retval; } - if (nodeType == typeof (string)) + if (nodeType == typeof(string)) return valuestring; - if (nodeType == typeof (decimal)) + if (nodeType == typeof(decimal)) { decimal retval; if (decimal.TryParse(valuestring, NumberStyles.Number, CultureInfo.InvariantCulture, out retval)) return retval; } - else if (nodeType == typeof (Uri)) + else if (nodeType == typeof(Uri)) { Uri retval; if (Uri.TryCreate(valuestring, UriKind.RelativeOrAbsolute, out retval)) diff --git a/src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs index c10a85f..b5f562f 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs +++ b/src/Tizen.NUI/src/internal/Xaml/ExpandMarkupsVisitor.cs @@ -90,7 +90,7 @@ namespace Tizen.NUI.Xaml throw new Exception("Expression did not end in '}'"); var serviceProvider = new XamlServiceProvider(node, Context); - serviceProvider.Add(typeof (IXmlNamespaceResolver), nsResolver); + serviceProvider.Add(typeof(IXmlNamespaceResolver), nsResolver); return new MarkupExpansionParser().Parse(match, ref expression, serviceProvider); } @@ -106,11 +106,11 @@ namespace Tizen.NUI.Xaml public INode Parse(string match, ref string remaining, IServiceProvider serviceProvider) { - var nsResolver = serviceProvider.GetService(typeof (IXmlNamespaceResolver)) as IXmlNamespaceResolver; + var nsResolver = serviceProvider.GetService(typeof(IXmlNamespaceResolver)) as IXmlNamespaceResolver; if (nsResolver == null) throw new ArgumentException(nameof(nsResolver)); IXmlLineInfo xmlLineInfo = null; - var xmlLineInfoProvider = serviceProvider.GetService(typeof (IXmlLineInfoProvider)) as IXmlLineInfoProvider; + var xmlLineInfoProvider = serviceProvider.GetService(typeof(IXmlLineInfoProvider)) as IXmlLineInfoProvider; if (xmlLineInfoProvider != null) xmlLineInfo = xmlLineInfoProvider.XmlLineInfo; @@ -131,7 +131,7 @@ namespace Tizen.NUI.Xaml } Type type; - var typeResolver = serviceProvider.GetService(typeof (IXamlTypeResolver)) as IXamlTypeResolver; + var typeResolver = serviceProvider.GetService(typeof(IXamlTypeResolver)) as IXamlTypeResolver; if (typeResolver == null) type = null; // Add Binding and StaticResource support, The ordinal code can't find BindingExtension for Binding @@ -148,7 +148,7 @@ namespace Tizen.NUI.Xaml //The order of lookup is to look for the Extension-suffixed class name first and then look for the class name without the Extension suffix. if (!typeResolver.TryResolve(match + "Extension", out type) && !typeResolver.TryResolve(match, out type)) { - var lineInfoProvider = serviceProvider.GetService(typeof (IXmlLineInfoProvider)) as IXmlLineInfoProvider; + var lineInfoProvider = serviceProvider.GetService(typeof(IXmlLineInfoProvider)) as IXmlLineInfoProvider; var lineInfo = (lineInfoProvider != null) ? lineInfoProvider.XmlLineInfo : new XmlLineInfo(); throw new XamlParseException(String.Format("MarkupExtension not found for {0}", match), lineInfo); } @@ -180,7 +180,7 @@ namespace Tizen.NUI.Xaml protected override void SetPropertyValue(string prop, string strValue, object value, IServiceProvider serviceProvider) { - var nsResolver = serviceProvider.GetService(typeof (IXmlNamespaceResolver)) as IXmlNamespaceResolver; + var nsResolver = serviceProvider.GetService(typeof(IXmlNamespaceResolver)) as IXmlNamespaceResolver; var childnode = value as INode ?? new ValueNode(strValue, nsResolver); childnode.Parent = node; diff --git a/src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs index 2be8e7b..33c7ab1 100755 --- a/src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs +++ b/src/Tizen.NUI/src/internal/Xaml/FillResourceDictionariesVisitor.cs @@ -40,9 +40,11 @@ namespace Tizen.NUI.Xaml var value = Values[node]; XmlName propertyName; //Set RD to VE - if (typeof(ResourceDictionary).IsAssignableFrom(Context.Types[node]) && ApplyPropertiesVisitor.TryGetPropertyName(node, parentNode, out propertyName)) { + if (typeof(ResourceDictionary).IsAssignableFrom(Context.Types[node]) && ApplyPropertiesVisitor.TryGetPropertyName(node, parentNode, out propertyName)) + { if ((propertyName.LocalName == "Resources" || - propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary) { + propertyName.LocalName.EndsWith(".Resources", StringComparison.Ordinal)) && value is ResourceDictionary) + { var source = Values[parentNode]; ApplyPropertiesVisitor.SetPropertyValue(source, propertyName, value, Context.RootElement, node, Context, node); return; @@ -50,11 +52,11 @@ namespace Tizen.NUI.Xaml } //Only proceed further if the node is a keyless RD - if ( parentNode is IElementNode + if (parentNode is IElementNode && typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode)]) && !((IElementNode)parentNode).Properties.ContainsKey(XmlName.xKey)) node.Accept(new ApplyPropertiesVisitor(Context, stopOnResourceDictionary: false), parentNode); - else if ( parentNode is ListNode + else if (parentNode is ListNode && typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode.Parent)]) && !((IElementNode)parentNode.Parent).Properties.ContainsKey(XmlName.xKey)) node.Accept(new ApplyPropertiesVisitor(Context, stopOnResourceDictionary: false), parentNode); @@ -73,11 +75,11 @@ namespace Tizen.NUI.Xaml var enode = node as ElementNode; if (enode is null) return false; - if ( parentNode is IElementNode + if (parentNode is IElementNode && typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode)]) && !((IElementNode)parentNode).Properties.ContainsKey(XmlName.xKey)) return true; - if ( parentNode is ListNode + if (parentNode is ListNode && typeof(ResourceDictionary).IsAssignableFrom(Context.Types[((IElementNode)parentNode.Parent)]) && !((IElementNode)parentNode.Parent).Properties.ContainsKey(XmlName.xKey)) return true; diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExpressionParser.cs b/src/Tizen.NUI/src/internal/Xaml/MarkupExpressionParser.cs index 188ec53..6a1d010 100755 --- a/src/Tizen.NUI/src/internal/Xaml/MarkupExpressionParser.cs +++ b/src/Tizen.NUI/src/internal/Xaml/MarkupExpressionParser.cs @@ -166,7 +166,7 @@ namespace Tizen.NUI.Xaml if (remaining[end] == stringTerminator) { inString = false; - end ++; + end++; break; } } @@ -176,7 +176,7 @@ namespace Tizen.NUI.Xaml { inString = true; stringTerminator = remaining[end]; - end ++; + end++; continue; } } @@ -184,7 +184,7 @@ namespace Tizen.NUI.Xaml // If this is an escape char, consume it and append the next char to our piece. if (remaining[end] == '\\') { - end ++; + end++; if (end == remaining.Length) break; } @@ -210,7 +210,7 @@ namespace Tizen.NUI.Xaml // Whitespace is trimmed from the end of the piece before stripping // quote chars from the start/end of the string. while (piece.Length > 0 && char.IsWhiteSpace(piece[piece.Length - 1])) - piece.Length --; + piece.Length--; if (piece.Length >= 2) { diff --git a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs index e36449e..242ad6e 100755 --- a/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs +++ b/src/Tizen.NUI/src/internal/Xaml/MarkupExtensionParser.cs @@ -10,7 +10,7 @@ namespace Tizen.NUI.Xaml public object Parse(string match, ref string remaining, IServiceProvider serviceProvider) { - var typeResolver = serviceProvider.GetService(typeof (IXamlTypeResolver)) as IXamlTypeResolver; + var typeResolver = serviceProvider.GetService(typeof(IXamlTypeResolver)) as IXamlTypeResolver; //shortcut for Binding and StaticResource, to avoid too many reflection calls. if (match == "Binding") @@ -28,7 +28,7 @@ namespace Tizen.NUI.Xaml //The order of lookup is to look for the Extension-suffixed class name first and then look for the class name without the Extension suffix. if (!typeResolver.TryResolve(match + "Extension", out type) && !typeResolver.TryResolve(match, out type)) { - var lineInfoProvider = serviceProvider.GetService(typeof (IXmlLineInfoProvider)) as IXmlLineInfoProvider; + var lineInfoProvider = serviceProvider.GetService(typeof(IXmlLineInfoProvider)) as IXmlLineInfoProvider; var lineInfo = (lineInfoProvider != null) ? lineInfoProvider.XmlLineInfo : new XmlLineInfo(); throw new XamlParseException(String.Format("MarkupExtension not found for {0}", match), lineInfo); } @@ -37,7 +37,7 @@ namespace Tizen.NUI.Xaml if (markupExtension == null) { - var lineInfoProvider = serviceProvider.GetService(typeof (IXmlLineInfoProvider)) as IXmlLineInfoProvider; + var lineInfoProvider = serviceProvider.GetService(typeof(IXmlLineInfoProvider)) as IXmlLineInfoProvider; var lineInfo = (lineInfoProvider != null) ? lineInfoProvider.XmlLineInfo : new XmlLineInfo(); throw new XamlParseException(String.Format("Missing public default constructor for MarkupExtension {0}", match), lineInfo); diff --git a/src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs index 99e0f89..ffccf1d 100755 --- a/src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs +++ b/src/Tizen.NUI/src/internal/Xaml/NamescopingVisitor.cs @@ -70,7 +70,7 @@ namespace Tizen.NUI.Xaml static bool IsVisualStateGroupList(ElementNode node) { - return node != null && node.XmlType.Name == "VisualStateGroup" && node.Parent is IListNode; + return node != null && node.XmlType.Name == "VisualStateGroup" && node.Parent is IListNode; } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs b/src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs index 6b25652..86d7f2f 100755 --- a/src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs +++ b/src/Tizen.NUI/src/internal/Xaml/ResourcesLoader.cs @@ -10,10 +10,11 @@ namespace Tizen.NUI.Xaml { internal class ResourcesLoader : IResourcesLoader { - public T CreateFromResource(string resourcePath, Assembly assembly, IXmlLineInfo lineInfo) where T: new() + public T CreateFromResource(string resourcePath, Assembly assembly, IXmlLineInfo lineInfo) where T : new() { var alternateResource = ResourceLoader.ResourceProvider?.Invoke(assembly.GetName(), resourcePath); - if (alternateResource != null) { + if (alternateResource != null) + { var rd = new T(); rd.LoadFromXaml(alternateResource); return rd; @@ -23,10 +24,12 @@ namespace Tizen.NUI.Xaml if (resourceId == null) throw new XamlParseException($"Resource '{resourcePath}' not found.", lineInfo); - using (var stream = assembly.GetManifestResourceStream(resourceId)) { + using (var stream = assembly.GetManifestResourceStream(resourceId)) + { if (stream == null) throw new XamlParseException($"No resource found for '{resourceId}'.", lineInfo); - using (var reader = new StreamReader(stream)) { + using (var reader = new StreamReader(stream)) + { var rd = new T(); rd.LoadFromXaml(reader.ReadToEnd()); return rd; @@ -44,7 +47,8 @@ namespace Tizen.NUI.Xaml if (resourceId == null) throw new XamlParseException($"Resource '{resourcePath}' not found.", lineInfo); - using (var stream = assembly.GetManifestResourceStream(resourceId)) { + using (var stream = assembly.GetManifestResourceStream(resourceId)) + { if (stream == null) throw new XamlParseException($"No resource found for '{resourceId}'.", lineInfo); using (var reader = new StreamReader(stream)) diff --git a/src/Tizen.NUI/src/internal/Xaml/TypeArgumentsParser.cs b/src/Tizen.NUI/src/internal/Xaml/TypeArgumentsParser.cs index 42e80ac..6ab4dbe 100755 --- a/src/Tizen.NUI/src/internal/Xaml/TypeArgumentsParser.cs +++ b/src/Tizen.NUI/src/internal/Xaml/TypeArgumentsParser.cs @@ -54,12 +54,15 @@ namespace Tizen.NUI.Xaml return null; string prefix, name; - if (split.Length == 2) { - prefix = split [0]; - name = split [1]; - } else { + if (split.Length == 2) + { + prefix = split[0]; + name = split[1]; + } + else + { prefix = ""; - name = split [0]; + name = split[0]; } var namespaceuri = resolver.LookupNamespace(prefix); diff --git a/src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs b/src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs index e166525..86fefcf 100755 --- a/src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs +++ b/src/Tizen.NUI/src/internal/Xaml/TypeConversionExtensions.cs @@ -101,9 +101,9 @@ namespace Tizen.NUI.Xaml attributes.FirstOrDefault(cad => TypeConverterAttribute.TypeConvertersType.Contains(cad.AttributeType.FullName)); if (converterAttribute == null) return null; - if (converterAttribute.ConstructorArguments[0].ArgumentType == typeof (string)) + if (converterAttribute.ConstructorArguments[0].ArgumentType == typeof(string)) return (string)converterAttribute.ConstructorArguments[0].Value; - if (converterAttribute.ConstructorArguments[0].ArgumentType == typeof (Type)) + if (converterAttribute.ConstructorArguments[0].ArgumentType == typeof(Type)) return ((Type)converterAttribute.ConstructorArguments[0].Value).AssemblyQualifiedName; return null; } @@ -163,7 +163,7 @@ namespace Tizen.NUI.Xaml var ignoreCase = (serviceProvider?.GetService(typeof(IConverterOptions)) as IConverterOptions)?.IgnoreCase ?? false; //If the type is nullable, as the value is not null, it's safe to assume we want the built-in conversion - if (toType.GetTypeInfo().IsGenericType && toType.GetGenericTypeDefinition() == typeof (Nullable<>)) + if (toType.GetTypeInfo().IsGenericType && toType.GetGenericTypeDefinition() == typeof(Nullable<>)) toType = Nullable.GetUnderlyingType(toType); //Obvious Built-in conversions @@ -186,35 +186,38 @@ namespace Tizen.NUI.Xaml return UInt32.Parse(str, CultureInfo.InvariantCulture); if (toType == typeof(UInt64)) return UInt64.Parse(str, CultureInfo.InvariantCulture); - if (toType == typeof (Single)) + if (toType == typeof(Single)) return Single.Parse(str, CultureInfo.InvariantCulture); - if (toType == typeof (Double)) + if (toType == typeof(Double)) return Double.Parse(str, CultureInfo.InvariantCulture); - if (toType == typeof (Boolean)) + if (toType == typeof(Boolean)) return Boolean.Parse(str); - if (toType == typeof (TimeSpan)) + if (toType == typeof(TimeSpan)) return TimeSpan.Parse(str, CultureInfo.InvariantCulture); - if (toType == typeof (DateTime)) + if (toType == typeof(DateTime)) return DateTime.Parse(str, CultureInfo.InvariantCulture); - if (toType == typeof(Char)) { + if (toType == typeof(Char)) + { char c = '\0'; Char.TryParse(str, out c); return c; } - if (toType == typeof (String) && str.StartsWith("{}", StringComparison.Ordinal)) + if (toType == typeof(String) && str.StartsWith("{}", StringComparison.Ordinal)) return str.Substring(2); - if (toType == typeof (String)) + if (toType == typeof(String)) return value; if (toType == typeof(Decimal)) return Decimal.Parse(str, CultureInfo.InvariantCulture); } //if the value is not assignable and there's an implicit conversion, convert - if (value != null && !toType.IsAssignableFrom(value.GetType())) { - var opImplicit = value.GetType().GetImplicitConversionOperator(fromType: value.GetType(), toType: toType) + if (value != null && !toType.IsAssignableFrom(value.GetType())) + { + var opImplicit = value.GetType().GetImplicitConversionOperator(fromType: value.GetType(), toType: toType) ?? toType.GetImplicitConversionOperator(fromType: value.GetType(), toType: toType); - if (opImplicit != null) { + if (opImplicit != null) + { value = opImplicit.Invoke(null, new[] { value }); return value; } diff --git a/src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs b/src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs index c005729..f731f9c 100755 --- a/src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs +++ b/src/Tizen.NUI/src/internal/Xaml/VisualStateManager.cs @@ -18,8 +18,8 @@ namespace Tizen.NUI.Xaml } public static readonly BindableProperty VisualStateGroupsProperty = - BindableProperty.CreateAttached("VisualStateGroups", typeof(VisualStateGroupList), typeof(/*VisualElement*/BaseHandle), - defaultValue: null, propertyChanged: VisualStateGroupsPropertyChanged, + BindableProperty.CreateAttached("VisualStateGroups", typeof(VisualStateGroupList), typeof(/*VisualElement*/BaseHandle), + defaultValue: null, propertyChanged: VisualStateGroupsPropertyChanged, defaultValueCreator: bindable => new VisualStateGroupList()); static void VisualStateGroupsPropertyChanged(BindableObject bindable, object oldValue, object newValue) @@ -96,7 +96,7 @@ namespace Tizen.NUI.Xaml readonly IList _internalList; void Validate(IList groups) - { + { // If we have 1 group, no need to worry about duplicate group names if (groups.Count > 1) { @@ -117,7 +117,7 @@ namespace Tizen.NUI.Xaml } } - public VisualStateGroupList() + public VisualStateGroupList() { _internalList = new WatchAddList(Validate); } @@ -199,7 +199,7 @@ namespace Tizen.NUI.Xaml [RuntimeNameProperty(nameof(Name))] [ContentProperty(nameof(States))] - internal sealed class VisualStateGroup + internal sealed class VisualStateGroup { public VisualStateGroup() { @@ -226,7 +226,7 @@ namespace Tizen.NUI.Xaml internal VisualStateGroup Clone() { - var clone = new VisualStateGroup {TargetType = TargetType, Name = Name, CurrentState = CurrentState}; + var clone = new VisualStateGroup { TargetType = TargetType, Name = Name, CurrentState = CurrentState }; foreach (VisualState state in States) { clone.States.Add(state.Clone()); @@ -249,7 +249,7 @@ namespace Tizen.NUI.Xaml } [RuntimeNameProperty(nameof(Name))] - internal sealed class VisualState + internal sealed class VisualState { public VisualState() { @@ -257,7 +257,7 @@ namespace Tizen.NUI.Xaml } public string Name { get; set; } - public IList Setters { get;} + public IList Setters { get; } public Type TargetType { get; set; } internal VisualState Clone() diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs b/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs index faae3b2..68e9421 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs +++ b/src/Tizen.NUI/src/internal/Xaml/XamlLoader.cs @@ -42,14 +42,15 @@ namespace Tizen.NUI.Xaml.Internals { /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - [Obsolete ("Replaced by ResourceLoader")] + [Obsolete("Replaced by ResourceLoader")] public static class XamlLoader { static Func xamlFileProvider; /// This will be public opened in tizen_6.0 after ACR done. Before ACR, need to be hidden as inhouse API. [EditorBrowsable(EditorBrowsableState.Never)] - public static Func XamlFileProvider { + public static Func XamlFileProvider + { get { return xamlFileProvider; } internal set { diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlNode.cs b/src/Tizen.NUI/src/internal/Xaml/XamlNode.cs index 44a7df8..616f705 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlNode.cs +++ b/src/Tizen.NUI/src/internal/Xaml/XamlNode.cs @@ -89,7 +89,8 @@ namespace Tizen.NUI.Xaml visitor.Visit(this, parentNode); } - public override INode Clone() => new ValueNode(Value, NamespaceResolver, LineNumber, LinePosition) { + public override INode Clone() => new ValueNode(Value, NamespaceResolver, LineNumber, LinePosition) + { IgnorablePrefixes = IgnorablePrefixes }; } @@ -110,7 +111,8 @@ namespace Tizen.NUI.Xaml visitor.Visit(this, parentNode); } - public override INode Clone() => new MarkupNode(MarkupString, NamespaceResolver, LineNumber, LinePosition) { + public override INode Clone() => new MarkupNode(MarkupString, NamespaceResolver, LineNumber, LinePosition) + { IgnorablePrefixes = IgnorablePrefixes }; } @@ -141,7 +143,8 @@ namespace Tizen.NUI.Xaml if (!SkipVisitNode(visitor, parentNode) && visitor.VisitingMode == TreeVisitingMode.TopDown) visitor.Visit(this, parentNode); - if (!SkipChildren(visitor, this, parentNode)) { + if (!SkipChildren(visitor, this, parentNode)) + { foreach (var node in Properties.Values.ToList()) node.Accept(visitor, this); foreach (var node in CollectionItems) @@ -174,7 +177,8 @@ namespace Tizen.NUI.Xaml public override INode Clone() { - var clone = new ElementNode(XmlType, NamespaceURI, NamespaceResolver, LineNumber, LinePosition) { + var clone = new ElementNode(XmlType, NamespaceURI, NamespaceResolver, LineNumber, LinePosition) + { IgnorablePrefixes = IgnorablePrefixes }; foreach (var kvp in Properties) @@ -198,7 +202,8 @@ namespace Tizen.NUI.Xaml if (!SkipVisitNode(visitor, parentNode) && visitor.VisitingMode == TreeVisitingMode.TopDown) visitor.Visit(this, parentNode); - if (!SkipChildren(visitor, this, parentNode)) { + if (!SkipChildren(visitor, this, parentNode)) + { foreach (var node in Properties.Values.ToList()) node.Accept(visitor, this); foreach (var node in CollectionItems) @@ -236,7 +241,8 @@ namespace Tizen.NUI.Xaml var items = new List(); foreach (var p in CollectionItems) items.Add(p.Clone()); - return new ListNode(items, NamespaceResolver, LineNumber, LinePosition) { + return new ListNode(items, NamespaceResolver, LineNumber, LinePosition) + { IgnorablePrefixes = IgnorablePrefixes }; } @@ -246,7 +252,8 @@ namespace Tizen.NUI.Xaml { public static bool SkipPrefix(this INode node, string prefix) { - do { + do + { if (node.IgnorablePrefixes != null && node.IgnorablePrefixes.Contains(prefix)) return true; node = node.Parent; diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs b/src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs index 6868780..49adddb 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs +++ b/src/Tizen.NUI/src/internal/Xaml/XamlNodeVisitor.cs @@ -18,7 +18,8 @@ namespace Tizen.NUI.Xaml bool IsResourceDictionary(ElementNode node); } - internal enum TreeVisitingMode { + internal enum TreeVisitingMode + { TopDown, BottomUp } diff --git a/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs b/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs index cc64340..6b01cbc 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs +++ b/src/Tizen.NUI/src/internal/Xaml/XamlParser.cs @@ -51,7 +51,7 @@ namespace Tizen.NUI.Xaml IList> xmlns; var attributes = ParseXamlAttributes(reader, out xmlns); var prefixes = PrefixesToIgnore(xmlns); - (rootNode.IgnorablePrefixes ?? (rootNode.IgnorablePrefixes=new List())).AddRange(prefixes); + (rootNode.IgnorablePrefixes ?? (rootNode.IgnorablePrefixes = new List())).AddRange(prefixes); rootNode.Properties.AddRange(attributes); ParseXamlElementFor(rootNode, reader); } @@ -190,7 +190,7 @@ namespace Tizen.NUI.Xaml throw new XamlParseException("Closing PropertyElement expected", (IXmlLineInfo)reader); } - static IList> ParseXamlAttributes(XmlReader reader, out IList> xmlns) + static IList> ParseXamlAttributes(XmlReader reader, out IList> xmlns) { Debug.Assert(reader.NodeType == XmlNodeType.Element); var attributes = new List>(); @@ -200,7 +200,8 @@ namespace Tizen.NUI.Xaml reader.MoveToAttribute(i); //skip xmlns - if (reader.NamespaceURI == "http://www.w3.org/2000/xmlns/") { + if (reader.NamespaceURI == "http://www.w3.org/2000/xmlns/") + { xmlns.Add(new KeyValuePair(reader.LocalName, reader.Value)); continue; } @@ -214,50 +215,52 @@ namespace Tizen.NUI.Xaml if (reader.NamespaceURI == X2006Uri) { - switch (reader.Name) { - case "x:Key": - propertyName = XmlName.xKey; - break; - case "x:Name": - propertyName = XmlName.xName; - break; - case "x:Class": - case "x:FieldModifier": - continue; - default: - Debug.WriteLine("Unhandled attribute {0}", reader.Name); - continue; + switch (reader.Name) + { + case "x:Key": + propertyName = XmlName.xKey; + break; + case "x:Name": + propertyName = XmlName.xName; + break; + case "x:Class": + case "x:FieldModifier": + continue; + default: + Debug.WriteLine("Unhandled attribute {0}", reader.Name); + continue; } } if (reader.NamespaceURI == X2009Uri) { - switch (reader.Name) { - case "x:Key": - propertyName = XmlName.xKey; - break; - case "x:Name": - propertyName = XmlName.xName; - break; - case "x:TypeArguments": - propertyName = XmlName.xTypeArguments; - value = TypeArgumentsParser.ParseExpression((string)value, (IXmlNamespaceResolver)reader, (IXmlLineInfo)reader); - break; - case "x:DataType": - propertyName = XmlName.xDataType; - break; - case "x:Class": - case "x:FieldModifier": - continue; - case "x:FactoryMethod": - propertyName = XmlName.xFactoryMethod; - break; - case "x:Arguments": - propertyName = XmlName.xArguments; - break; - default: - Debug.WriteLine("Unhandled attribute {0}", reader.Name); - continue; + switch (reader.Name) + { + case "x:Key": + propertyName = XmlName.xKey; + break; + case "x:Name": + propertyName = XmlName.xName; + break; + case "x:TypeArguments": + propertyName = XmlName.xTypeArguments; + value = TypeArgumentsParser.ParseExpression((string)value, (IXmlNamespaceResolver)reader, (IXmlLineInfo)reader); + break; + case "x:DataType": + propertyName = XmlName.xDataType; + break; + case "x:Class": + case "x:FieldModifier": + continue; + case "x:FactoryMethod": + propertyName = XmlName.xFactoryMethod; + break; + case "x:Arguments": + propertyName = XmlName.xArguments; + break; + default: + Debug.WriteLine("Unhandled attribute {0}", reader.Name); + continue; } } @@ -271,7 +274,8 @@ namespace Tizen.NUI.Xaml static IList PrefixesToIgnore(IList> xmlns) { var prefixes = new List(); - foreach (var kvp in xmlns) { + foreach (var kvp in xmlns) + { var prefix = kvp.Key; string typeName = null, ns = null, asm = null; @@ -313,7 +317,8 @@ namespace Tizen.NUI.Xaml s_xmlnsDefinitions = new List(); foreach (var assembly in s_assemblies) - foreach (XmlnsDefinitionAttribute attribute in assembly.GetCustomAttributes(typeof(XmlnsDefinitionAttribute))) { + foreach (XmlnsDefinitionAttribute attribute in assembly.GetCustomAttributes(typeof(XmlnsDefinitionAttribute))) + { s_xmlnsDefinitions.Add(attribute); attribute.AssemblyName = attribute.AssemblyName ?? assembly.FullName; } @@ -333,16 +338,19 @@ namespace Tizen.NUI.Xaml var lookupAssemblies = new List(); var lookupNames = new List(); - foreach (var xmlnsDef in s_xmlnsDefinitions) { + foreach (var xmlnsDef in s_xmlnsDefinitions) + { if (xmlnsDef.XmlNamespace != namespaceURI) continue; lookupAssemblies.Add(xmlnsDef); } - if (lookupAssemblies.Count == 0) { + if (lookupAssemblies.Count == 0) + { string ns, asmstring, _; XmlnsHelper.ParseXmlns(namespaceURI, out _, out ns, out asmstring); - lookupAssemblies.Add(new XmlnsDefinitionAttribute(namespaceURI, ns) { + lookupAssemblies.Add(new XmlnsDefinitionAttribute(namespaceURI, ns) + { AssemblyName = asmstring ?? currentAssembly.FullName }); } @@ -361,7 +369,8 @@ namespace Tizen.NUI.Xaml } Type type = null; - foreach (var asm in lookupAssemblies) { + foreach (var asm in lookupAssemblies) + { foreach (var name in lookupNames) { if ((type = Type.GetType($"{asm.ClrNamespace}.{name}, {asm.AssemblyName}")) != null) @@ -387,7 +396,7 @@ namespace Tizen.NUI.Xaml if (type != null && typeArguments != null) { XamlParseException innerexception = null; - var args = typeArguments.Select(delegate(XmlType xmltype) + var args = typeArguments.Select(delegate (XmlType xmltype) { XamlParseException xpe; var t = GetElementType(xmltype, xmlInfo, currentAssembly, out xpe); diff --git a/src/Tizen.NUI/src/internal/Xaml/XmlName.cs b/src/Tizen.NUI/src/internal/Xaml/XmlName.cs index 7cb0a26..bce027b 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XmlName.cs +++ b/src/Tizen.NUI/src/internal/Xaml/XmlName.cs @@ -27,7 +27,7 @@ namespace Tizen.NUI.Xaml { if (obj == null) return false; - if (obj.GetType() != typeof (XmlName)) + if (obj.GetType() != typeof(XmlName)) return false; var other = (XmlName)obj; return NamespaceURI == other.NamespaceURI && LocalName == other.LocalName; @@ -53,6 +53,6 @@ namespace Tizen.NUI.Xaml => x1.NamespaceURI == x2.NamespaceURI && x1.LocalName == x2.LocalName; public static bool operator !=(XmlName x1, XmlName x2) - => !(x1 == x2); + => !(x1 == x2); } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs b/src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs index ff51cf4..6f58940 100755 --- a/src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs +++ b/src/Tizen.NUI/src/internal/Xaml/XmlnsHelper.cs @@ -20,7 +20,8 @@ namespace Tizen.NUI.Xaml xmlns = xmlns.Trim(); - if (xmlns.StartsWith("using:", StringComparison.Ordinal)) { + if (xmlns.StartsWith("using:", StringComparison.Ordinal)) + { ParseUsing(xmlns, out typeName, out ns, out asm); return; } @@ -60,8 +61,10 @@ namespace Tizen.NUI.Xaml { typeName = ns = asm = null; - foreach (var decl in xmlns.Split(';')) { - if (decl.StartsWith("using:", StringComparison.Ordinal)) { + foreach (var decl in xmlns.Split(';')) + { + if (decl.StartsWith("using:", StringComparison.Ordinal)) + { ns = decl.Substring(6, decl.Length - 6); continue; } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs b/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs index 895c0c3..e92af4e 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/BindingExpression.cs @@ -289,12 +289,15 @@ namespace Tizen.NUI.Binding part.IndexerName = indexerName; #if NETSTANDARD2_0 - try { + try + { property = sourceType.GetDeclaredProperty(indexerName); } - catch (AmbiguousMatchException) { + catch (AmbiguousMatchException) + { // Get most derived instance of property - foreach (var p in sourceType.GetProperties().Where(prop => prop.Name == indexerName)) { + foreach (var p in sourceType.GetProperties().Where(prop => prop.Name == indexerName)) + { if (property == null || property.DeclaringType.IsAssignableFrom(property.DeclaringType)) property = p; } @@ -351,7 +354,7 @@ namespace Tizen.NUI.Binding } if (property.CanWrite && property.SetMethod != null) { - if(property.SetMethod.IsPublic && !property.SetMethod.IsStatic) + if (property.SetMethod.IsPublic && !property.SetMethod.IsStatic) { part.LastSetter = property.SetMethod; part.SetterType = part.LastSetter.GetParameters().Last().ParameterType; diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs b/src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs index 6bf047b..64e6603 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/DependencyResolver.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI.Binding return Activator.CreateInstance(type, args); } } - + return Activator.CreateInstance(type); } } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs b/src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs index d83d493..a2561b7 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/DependencyService.cs @@ -111,7 +111,7 @@ namespace Tizen.NUI.Binding Tizen.Log.Fatal("NUI", "Could not load assembly: {0} for Attibute {1} | Some renderers may not be loaded", assembly.FullName, targetAttrType.FullName); continue; } - + if (attributes.Length == 0) continue; diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs b/src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs index 2c465ec..1fd0c61 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/ExtentsTypeConverter.cs @@ -18,7 +18,7 @@ namespace Tizen.NUI.Binding { return new Extents(ushort.Parse(parts[0].Trim(), CultureInfo.InvariantCulture), ushort.Parse(parts[1].Trim(), CultureInfo.InvariantCulture), - ushort.Parse(parts[2].Trim(), CultureInfo.InvariantCulture), + ushort.Parse(parts[2].Trim(), CultureInfo.InvariantCulture), ushort.Parse(parts[3].Trim(), CultureInfo.InvariantCulture)); } else if (parts.Length == 1) diff --git a/src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs b/src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs index f30a1cd..c0dca73 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/FlowDirection.cs @@ -15,7 +15,8 @@ namespace Tizen.NUI.Binding { public override object ConvertFromInvariantString(string value) { - if (value != null) { + if (value != null) + { if (Enum.TryParse(value, out FlowDirection direction)) return direction; diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/PreserveAttribute.cs b/src/Tizen.NUI/src/internal/XamlBinding/Internals/PreserveAttribute.cs index 08aa02a..72e775c 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/PreserveAttribute.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/Internals/PreserveAttribute.cs @@ -3,20 +3,20 @@ using System.ComponentModel; namespace Tizen.NUI.Binding.Internals { - [AttributeUsage(AttributeTargets.All)] + [AttributeUsage(AttributeTargets.All)] internal class PreserveAttribute : Attribute - { - public bool AllMembers; - public bool Conditional; + { + public bool AllMembers; + public bool Conditional; - public PreserveAttribute(bool allMembers, bool conditional) - { - AllMembers = allMembers; - Conditional = conditional; - } + public PreserveAttribute(bool allMembers, bool conditional) + { + AllMembers = allMembers; + Conditional = conditional; + } - public PreserveAttribute() - { - } - } + public PreserveAttribute() + { + } + } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/XamlBinding/Internals/ResourceLoader.cs b/src/Tizen.NUI/src/internal/XamlBinding/Internals/ResourceLoader.cs index 364d6ab..bef855f 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/Internals/ResourceLoader.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/Internals/ResourceLoader.cs @@ -20,9 +20,11 @@ namespace Tizen.NUI.Binding.Internals }; //takes a resource path, returns string content - public static Func ResourceProvider { + public static Func ResourceProvider + { get => resourceProvider; - internal set { + internal set + { DesignMode.IsDesignModeEnabled = true; resourceProvider = value; } diff --git a/src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs b/src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs index e7327c3..ef25563 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/ListStringTypeConverter.cs @@ -12,8 +12,8 @@ namespace Tizen.NUI.Binding { if (value == null) return null; - - return value.Split(new [] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToList(); + + return value.Split(new[] { ',' }, StringSplitOptions.RemoveEmptyEntries).Select(s => s.Trim()).ToList(); } } } \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs index 7c2469b..8810ed2 100755 --- a/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs +++ b/src/Tizen.NUI/src/internal/XamlBinding/MergedStyle.cs @@ -53,13 +53,15 @@ namespace Tizen.NUI.Binding _styleClass = value; - if (_styleClass != null) { - _classStyleProperties = new List (); - foreach (var styleClass in _styleClass) { - var classStyleProperty = BindableProperty.Create ("ClassStyle", typeof(IList