From 2952cd3449bd9bbce765654d872fa88f9395f643 Mon Sep 17 00:00:00 2001 From: Umar Date: Fri, 26 May 2017 19:09:48 +0100 Subject: [PATCH] Syncing dali_sharp with NUI Change-Id: I36d4bd764e7da6b6df971407c0d1210b93e3d62d --- .../examples/control-dashboard.cs | 16 +- .../NUISamples.TizenTV/examples/custom-control.cs | 10 +- .../NUISamples.TizenTV/examples/dali-test.cs | 18 +- .../date-picker-using-json.cs | 4 +- .../NUISamples.TizenTV/examples/date-picker.cs | 14 +- .../NUISamples.TizenTV/examples/flex-container.cs | 16 +- .../NUISamples.TizenTV/examples/hello-test.cs | 6 +- .../NUISamples.TizenTV/examples/hello-world.cs | 6 +- .../NUISamples.TizenTV/examples/image-view.cs | 24 +- .../examples/positionUsesAnchorPoint-test.cs | 6 +- .../NUISamples.TizenTV/examples/relative-vector.cs | 6 +- .../NUISamples.TizenTV/examples/scroll-view.cs | 14 +- .../examples/sibling-order-test.cs | 10 +- .../NUISamples.TizenTV/examples/test1.cs | 8 +- .../examples/user-alphafunction.cs | 18 +- .../examples/view-navi-property.cs | 4 +- .../examples/visual-animation-test.cs | 10 +- .../examples/visual-animation-test2.cs | 10 +- .../examples/visual-view-test.cs | 8 +- .../examples/visual-view-test2.cs | 8 +- .../examples/visual-view-test3.cs | 8 +- .../visuals-using-custom-view.cs | 2 +- src/Tizen.NUI/src/internal/Camera.cs | 18 +- .../src/internal/CustomAlgorithmInterface.cs | 4 +- src/Tizen.NUI/src/internal/FrameBuffer.cs | 106 +--- src/Tizen.NUI/src/internal/GestureDetector.cs | 4 +- src/Tizen.NUI/src/internal/ImfManager.cs | 2 +- src/Tizen.NUI/src/internal/ItemView.cs | 132 +--- .../{public => internal}/KeyInputFocusManager.cs | 5 +- src/Tizen.NUI/src/internal/LinearConstrainer.cs | 3 +- src/Tizen.NUI/src/internal/Model3dView.cs | 10 +- src/Tizen.NUI/src/internal/NDalic.cs | 671 ++++----------------- src/Tizen.NUI/src/internal/NDalicPINVOKE.cs | 6 +- src/Tizen.NUI/src/internal/PageTurnView.cs | 7 +- src/Tizen.NUI/src/internal/PanGestureDetector.cs | 2 +- src/Tizen.NUI/src/internal/PixelData.cs | 10 - src/Tizen.NUI/src/internal/RenderTask.cs | 16 +- src/Tizen.NUI/src/internal/Renderer.cs | 46 +- src/Tizen.NUI/src/internal/Slider.cs | 24 +- src/Tizen.NUI/src/internal/Texture.cs | 2 +- src/Tizen.NUI/src/internal/TimePeriod.cs | 4 +- src/Tizen.NUI/src/internal/TouchPoint.cs | 18 +- src/Tizen.NUI/src/internal/TypeAction.cs | 2 +- src/Tizen.NUI/src/internal/TypeRegistration.cs | 6 +- src/Tizen.NUI/src/internal/TypeRegistry.cs | 2 +- src/Tizen.NUI/src/internal/Uint16Pair.cs | 8 +- src/Tizen.NUI/src/internal/VectorUnsignedChar.cs | 12 +- src/Tizen.NUI/src/internal/ViewRegistry.cs | 10 +- src/Tizen.NUI/src/internal/VisualType.cs | 30 - src/Tizen.NUI/src/internal/VoidSignal.cs | 2 +- .../src/internal/dotnetcore/AddedException.cs | 30 +- src/Tizen.NUI/src/internal/uintp.cs | 4 +- src/Tizen.NUI/src/internal/ushortp.cs | 2 +- src/Tizen.NUI/src/public/AlphaFunction.cs | 9 +- src/Tizen.NUI/src/public/Animatable.cs | 26 +- .../src/public/BaseComponents/CustomView.cs | 2 +- .../src/public/BaseComponents/ImageView.cs | 112 +--- .../src/public/BaseComponents/TextEditor.cs | 241 +------- .../src/public/BaseComponents/TextField.cs | 230 +------ .../src/public/BaseComponents/TextLabel.cs | 145 +---- src/Tizen.NUI/src/public/BaseComponents/View.cs | 415 ++----------- src/Tizen.NUI/src/public/BaseHandle.cs | 17 - src/Tizen.NUI/src/public/Color.cs | 25 +- src/Tizen.NUI/src/public/CustomView/Spin.cs | 16 +- src/Tizen.NUI/src/public/Degree.cs | 2 +- src/Tizen.NUI/src/public/FlexContainer.cs | 204 +------ src/Tizen.NUI/src/public/FocusManager.cs | 4 +- src/Tizen.NUI/src/public/Gesture.cs | 14 +- src/Tizen.NUI/src/public/Hover.cs | 12 +- src/Tizen.NUI/src/public/Key.cs | 25 +- src/Tizen.NUI/src/public/KeyFrames.cs | 14 +- src/Tizen.NUI/src/public/Layer.cs | 249 +------- src/Tizen.NUI/src/public/LongPressGesture.cs | 20 - src/Tizen.NUI/src/public/PaddingType.cs | 12 - src/Tizen.NUI/src/public/PanGesture.cs | 22 +- src/Tizen.NUI/src/public/Path.cs | 115 +--- src/Tizen.NUI/src/public/PinchGesture.cs | 23 +- src/Tizen.NUI/src/public/ProgressBar.cs | 128 +--- src/Tizen.NUI/src/public/Property.cs | 155 +---- src/Tizen.NUI/src/public/Radian.cs | 26 +- src/Tizen.NUI/src/public/Rectangle.cs | 21 - src/Tizen.NUI/src/public/Scrollable.cs | 133 +--- src/Tizen.NUI/src/public/StyleManager.cs | 4 +- src/Tizen.NUI/src/public/TableView.cs | 222 +------ src/Tizen.NUI/src/public/TapGesture.cs | 20 - src/Tizen.NUI/src/public/Timer.cs | 9 +- src/Tizen.NUI/src/public/Touch.cs | 7 - src/Tizen.NUI/src/public/TransitionData.cs | 9 +- src/Tizen.NUI/src/{internal => public}/TypeInfo.cs | 35 -- src/Tizen.NUI/src/public/UIComponents/Button.cs | 248 +------- .../src/public/UIComponents/CheckBoxButton.cs | 11 - src/Tizen.NUI/src/public/UIComponents/Popup.cs | 117 +--- .../src/public/UIComponents/PushButton.cs | 307 +--------- .../src/public/UIComponents/RadioButton.cs | 15 +- src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs | 118 +--- .../src/public/UIComponents/ScrollView.cs | 222 +------ .../src/public/UIComponents/ToggleButton.cs | 111 +--- src/Tizen.NUI/src/public/Vector2.cs | 53 +- src/Tizen.NUI/src/public/Vector3.cs | 55 +- src/Tizen.NUI/src/public/Vector4.cs | 53 +- src/Tizen.NUI/src/public/VideoView.cs | 107 +--- .../src/{internal => public}/ViewWrapper.cs | 16 +- src/Tizen.NUI/src/public/VisualBase.cs | 7 - src/Tizen.NUI/src/public/VisualFactory.cs | 17 - src/Tizen.NUI/src/public/Window.cs | 39 +- 105 files changed, 706 insertions(+), 4937 deletions(-) rename src/Tizen.NUI/src/{public => internal}/KeyInputFocusManager.cs (96%) delete mode 100644 src/Tizen.NUI/src/internal/VisualType.cs rename src/Tizen.NUI/src/{internal => public}/TypeInfo.cs (73%) rename src/Tizen.NUI/src/{internal => public}/ViewWrapper.cs (82%) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs index 5a20333..ff74609 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs @@ -85,7 +85,7 @@ namespace ControlDashboard TextLabel topLabel = new TextLabel(); topLabel.WidthResizePolicy = ResizePolicyType.FillToParent; topLabel.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent; - topLabel.AnchorPoint = AnchorPoint.TopCenter; + topLabel.PivotPoint = AnchorPoint.TopCenter; topLabel.SetSizeModeFactor(new Vector3(0.0f, 0.1f, 0.0f)); topLabel.BackgroundColor = new Color(43.0f / 255.0f, 145.0f / 255.0f, 175.0f / 255.0f, 1.0f); topLabel.TextColor = Color.White; @@ -102,7 +102,7 @@ namespace ControlDashboard _contentContainer.WidthResizePolicy = ResizePolicyType.FillToParent; _contentContainer.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent; _contentContainer.SetSizeModeFactor(new Vector3(0.0f, 0.9f, 0.0f)); - _contentContainer.AnchorPoint = AnchorPoint.BottomCenter; + _contentContainer.PivotPoint = AnchorPoint.BottomCenter; _contentContainer.Position = new Position(0, _window.Size.Height * 0.1f, 0); _contentContainer.SetRelativeHeight(0, 0.07f); _contentContainer.SetRelativeHeight(1, 0.26f); @@ -317,7 +317,7 @@ namespace ControlDashboard { PushButton button = new PushButton(); button.LabelText = "Popup"; - button.AnchorPoint = AnchorPoint.Center; + button.PivotPoint = AnchorPoint.Center; button.MaximumSize = new Size2D(150, 100); _popup = CreatePopup(); _popup.SetTitle(CreateTitle("Popup")); @@ -345,7 +345,7 @@ namespace ControlDashboard { PushButton button = new PushButton(); button.LabelText = "Toast"; - button.AnchorPoint = AnchorPoint.Center; + button.PivotPoint = AnchorPoint.Center; button.Clicked += (obj, ee) => { TypeInfo typeInfo = new TypeInfo(TypeRegistry.Get().GetTypeInfo("PopupToast")); @@ -390,22 +390,22 @@ namespace ControlDashboard footer.WidthResizePolicy = ResizePolicyType.FillToParent; footer.HeightResizePolicy = ResizePolicyType.Fixed; footer.Size = new Size(0.0f, 80.0f, 0.0f); - footer.AnchorPoint = AnchorPoint.Center; + footer.PivotPoint = AnchorPoint.Center; PushButton okButton = CreateOKButton(); - okButton.AnchorPoint = AnchorPoint.Center; + okButton.PivotPoint = AnchorPoint.Center; okButton.WidthResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; okButton.HeightResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; okButton.SetSizeModeFactor(new Vector3(-20.0f, -20.0f, 0.0f)); PushButton cancelButton = CreateCancelButton(); - cancelButton.AnchorPoint = AnchorPoint.Center; + cancelButton.PivotPoint = AnchorPoint.Center; cancelButton.WidthResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; cancelButton.HeightResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; cancelButton.SetSizeModeFactor(new Vector3(-20.0f, -20.0f, 0.0f)); TableView controlLayout = new TableView(1, 2); - controlLayout.AnchorPoint = AnchorPoint.Center; + controlLayout.PivotPoint = AnchorPoint.Center; controlLayout.WidthResizePolicy = ResizePolicyType.FillToParent; controlLayout.HeightResizePolicy = ResizePolicyType.FillToParent; controlLayout.SetCellPadding(new Size2D(10, 10)); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs index 2ffdbf7..b7fbe17 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -23,7 +23,7 @@ using Tizen.NUI; namespace CustomControlTest { - + // A custom control for star rating (draggable to change the rating) class StarRating : CustomView { @@ -202,7 +202,7 @@ namespace CustomControlTest FlexContainer container = new FlexContainer(); container.ParentOrigin = ParentOrigin.TopLeft; - container.AnchorPoint = AnchorPoint.TopLeft; + container.PivotPoint = AnchorPoint.TopLeft; container.FlexDirection = (int)FlexContainer.FlexDirectionType.Column; container.WidthResizePolicy = ResizePolicyType.FillToParent; container.HeightResizePolicy = ResizePolicyType.FillToParent; @@ -216,7 +216,7 @@ namespace CustomControlTest // Create a container to layout the image and rating (in each row) horizontally FlexContainer imageRow = new FlexContainer(); imageRow.ParentOrigin = ParentOrigin.TopLeft; - imageRow.AnchorPoint = AnchorPoint.TopLeft; + imageRow.PivotPoint = AnchorPoint.TopLeft; imageRow.FlexDirection = FlexContainer.FlexDirectionType.Row; imageRow.Flex = 1.0f; container.Add(imageRow); @@ -236,7 +236,7 @@ namespace CustomControlTest // Add the rating control to the row view.ParentOrigin = ParentOrigin.Center; - view.AnchorPoint = AnchorPoint.Center; + view.PivotPoint = AnchorPoint.Center; view.Size = new Vector3(200.0f, 40.0f, 0.0f); view.Flex = 0.7f; view.AlignSelf = (int)FlexContainer.Alignment.AlignCenter; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs index e7c54c7..7ad57aa 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs @@ -136,7 +136,7 @@ namespace DaliTest Animatable handle = new Animatable(); int myPropertyIndex = handle.RegisterProperty("myProperty", new PropertyValue(10.0f), PropertyAccessMode.ReadWrite); float myProperty = 0.0f; - handle.GetProperty(myPropertyIndex).Get(ref myProperty); + handle.GetProperty(myPropertyIndex).Get(out myProperty); Tizen.Log.Debug("NUI", "myProperty value: " + myProperty ); int myPropertyIndex2 = handle.RegisterProperty("myProperty2", new PropertyValue(new Size(5.0f, 5.0f, 0.0f)), PropertyAccessMode.ReadWrite); @@ -159,7 +159,7 @@ namespace DaliTest TextLabel text = new TextLabel("Hello Mono World"); text.ParentOrigin = ParentOrigin.Center; - text.AnchorPoint = AnchorPoint.Center; + text.PivotPoint = AnchorPoint.Center; text.HorizontalAlignment = HorizontalAlignment.Center; window.GetDefaultLayer().Add(text); @@ -541,9 +541,9 @@ namespace DaliTest label.TextColor = Color.Red; label.PointSize = 30.0f; label.ParentOrigin = ParentOrigin.TopLeft; - label.AnchorPoint = AnchorPoint.TopLeft; + label.PivotPoint = AnchorPoint.TopLeft; label.Position = new Position(0.0f, 50.0f, 0.0f); - Window.GetDefaultLayer().Add(label); + Window.Instance.GetDefaultLayer().Add(label); label.VisibilityChanged += (sender, e) => { if (e.Visibility) @@ -555,8 +555,8 @@ namespace DaliTest PushButton button = new PushButton(); button.LabelText = "Change Visibility"; button.ParentOrigin = ParentOrigin.TopLeft; - button.AnchorPoint = AnchorPoint.TopLeft; - Window.GetDefaultLayer().Add(button); + button.PivotPoint = AnchorPoint.TopLeft; + Window.Instance.GetDefaultLayer().Add(button); button.Clicked += (sender, e) => { if (label.Visible) @@ -578,13 +578,13 @@ namespace DaliTest image.ResourceUrl = _resPath + "/images/dog-anim.gif"; image.Size2D = new Size2D(150, 150); image.ParentOrigin = ParentOrigin.TopLeft; - image.AnchorPoint = AnchorPoint.TopLeft; + image.PivotPoint = AnchorPoint.TopLeft; image.Position = new Position(0.0f, 150.0f, 0.0f); image.ResourceReady += (sender, e) => { Tizen.Log.Debug("NUI", "Resource is ready!"); }; - Window.GetDefaultLayer().Add(image); + Window.Instance.GetDefaultLayer().Add(image); } public void WindowDevelPropertyTest() @@ -692,7 +692,7 @@ namespace DaliTest container.Position = new Position(-800.0f, -800.0f, 0.0f); Window.Instance.GetDefaultLayer().Add(container); Tizen.Log.Debug("NUI", "winow layer count is "+Window.Instance.GetLayerCount()); - Tizen.Log.Debug("NUI", "winow default layer child at 0 is "+Window.GetDefaultLayer().GetChildAt(0)); + Tizen.Log.Debug("NUI", "winow default layer child at 0 is "+Window.Instance.GetDefaultLayer().GetChildAt(0)); // Test downcast for native control TextLabel myLabel = new TextLabel(); myLabel.Name = "MyLabelName"; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs index 21e40b3..84a1f89 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs @@ -86,7 +86,7 @@ namespace DatePickerUsingJson FocusManager keyboardFocusManager = FocusManager.Instance; keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange; - keyboardFocusManager.FocusedViewEnterKeyPressed += OnFocusedViewEnterKeyPressed; + keyboardFocusManager.FocusedViewActivated += OnFocusedViewActivated; StyleManager.Get().ApplyTheme("/home/owner/apps_rw/NUISamples.TizenTV/res/json/date-picker-theme.json"); } @@ -128,7 +128,7 @@ namespace DatePickerUsingJson return nextFocusView; } - private void OnFocusedViewEnterKeyPressed(object source, FocusManager.FocusedViewEnterKeyEventArgs e) + private void OnFocusedViewActivated(object source, FocusManager.FocusedViewEnterKeyEventArgs e) { // Make the text field in the current focused spin to take the key input KeyInputFocusManager manager = KeyInputFocusManager.Get(); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs index 43f8215..ac65cc2 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,7 +58,7 @@ namespace DatePickerTest _container = new FlexContainer(); //_container.ParentOrigin = ParentOrigin.Center; - _container.AnchorPoint = AnchorPoint.Center; + _container.PivotPoint = AnchorPoint.Center; _container.FlexDirection = FlexContainer.FlexDirectionType.Row; _container.Size = new Vector3(480.0f, 150.0f, 0.0f); _container.Position2D = new Position2D(400, 400); @@ -67,7 +67,7 @@ namespace DatePickerTest // Create a Spin control for year _spinYear = new Spin(); - _spinYear.AnchorPoint = AnchorPoint.Center; + _spinYear.PivotPoint = AnchorPoint.Center; _spinYear.Flex = 0.3f; _spinYear.FlexMargin = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); _container.Add(_spinYear); @@ -84,7 +84,7 @@ namespace DatePickerTest // Create a Spin control for month _spinMonth = new Spin(); - _spinMonth.AnchorPoint = AnchorPoint.Center; + _spinMonth.PivotPoint = AnchorPoint.Center; _spinMonth.Flex = 0.3f; _spinMonth.FlexMargin = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); _container.Add(_spinMonth); @@ -101,7 +101,7 @@ namespace DatePickerTest // Create a Spin control for day _spinDay = new Spin(); - _spinDay.AnchorPoint = AnchorPoint.Center; + _spinDay.PivotPoint = AnchorPoint.Center; _spinDay.Flex = 0.3f; _spinDay.FlexMargin = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); _container.Add(_spinDay); @@ -118,7 +118,7 @@ namespace DatePickerTest FocusManager keyboardFocusManager = FocusManager.Instance; keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange; - keyboardFocusManager.FocusedViewEnterKeyPressed += OnFocusedActorEnterKeyPressed; + keyboardFocusManager.FocusedViewActivated += OnFocusedViewActivated; //////////////////////////////////////////////////////////////////////// _imfMgr = ImfManager.Get(); @@ -203,7 +203,7 @@ namespace DatePickerTest return nextFocusView; } - private void OnFocusedActorEnterKeyPressed(object source, FocusManager.FocusedViewEnterKeyEventArgs e) + private void OnFocusedViewActivated(object source, FocusManager.FocusedViewEnterKeyEventArgs e) { // Make the text field in the current focused spin to take the key input KeyInputFocusManager manager = KeyInputFocusManager.Get(); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs index 209703c..ce64758 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs @@ -35,7 +35,7 @@ namespace FlexContainerTest container = new FlexContainer(); container.Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height, 0); - container.AnchorPoint = AnchorPoint.TopLeft; + container.PivotPoint = AnchorPoint.TopLeft; container.Padding = new Vector4(100, 100, 100, 100); container.FlexWrap = FlexContainer.WrapType.Wrap; @@ -72,14 +72,14 @@ namespace FlexContainerTest else Tizen.Log.Debug("NUI", "FocusManager FocusChanged signal callback! e.NextView is null!"); }; //added - FocusManager.Instance.FocusedViewEnterKeyPressed += (sender, e) => + FocusManager.Instance.FocusedViewActivated += (sender, e) => { if (e.View) Tizen.Log.Debug("NUI", "FocusManager FocusedViewEnterKeyPressed signal callback! e.View.Name=" + e.View.Name); else Tizen.Log.Debug("NUI", "FocusManager FocusChanged signal callback! e.View is null!"); }; //added - Window.Instance.TouchEvent += (sender, e) => + Window.Instance.Touched += (sender, e) => { Tizen.Log.Debug("NUI", "Window Touch signal callback! To avoid crash, when losing key focus, set here again unless the NextView is null"); FocusManager.Instance.SetCurrentFocusView(label[3]); @@ -90,7 +90,7 @@ namespace FlexContainerTest pushButton1.MinimumSize = new Size2D(400, 200); pushButton1.LabelText = "+PreFocusChange"; pushButton1.ParentOrigin = ParentOrigin.TopLeft; - pushButton1.AnchorPoint = AnchorPoint.TopLeft; + pushButton1.PivotPoint = AnchorPoint.TopLeft; pushButton1.Position2D = new Position2D(200, 800); pushButton1.Clicked += (sender, e) => { @@ -108,7 +108,7 @@ namespace FlexContainerTest pushButton2.MinimumSize = new Size2D(400, 200); pushButton2.LabelText = "-PreFocusChange"; pushButton2.ParentOrigin = ParentOrigin.TopLeft; - pushButton2.AnchorPoint = AnchorPoint.TopLeft; + pushButton2.PivotPoint = AnchorPoint.TopLeft; pushButton2.Position2D = new Position2D(800, 800); pushButton2.Clicked += (sender, e) => { @@ -160,12 +160,12 @@ namespace FlexContainerTest Tizen.Log.Debug("NUI", "pushbutton1 Visible=" + pushButton1.Visible + " pushbutton2 Visible=" + pushButton2.Visible); //added break; case View.FocusDirection.Left: - //added + //added pushButton1.Show(); - pushButton2.Show(); + pushButton2.Show(); break; case View.FocusDirection.Right: - //added + //added pushButton1.Hide(); pushButton2.Hide(); break; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs index 8f38bb8..7e7da46 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,12 +59,12 @@ namespace HelloTest { // Connect the signal callback for window touched signal _window = Window.Instance; - _window.TouchEvent += OnWindowTouched; + _window.Touched += OnWindowTouched; // Add a _text label to the window _text = new TextLabel("Hello Mono World"); _text.ParentOrigin = ParentOrigin.Center; - _text.AnchorPoint = AnchorPoint.Center; + _text.PivotPoint = AnchorPoint.Center; _text.HorizontalAlignment = HorizontalAlignment.Center; _text.PointSize = 32.0f; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs index f8ee10f..2d9c793 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016 Samsung Electronics Co., Ltd. +* Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -53,7 +53,7 @@ namespace HelloWorldTest { Window window = Window.Instance; window.BackgroundColor = Color.White; - window.TouchEvent += OnWindowTouched; + window.Touched += OnWindowTouched; window.KeyEvent += OnWindowKeyEvent; TextLabel pixelLabel = new TextLabel("Test Pixel Size 32.0f"); @@ -84,7 +84,7 @@ namespace HelloWorldTest _text = new TextLabel("Hello NUI World"); _text.ParentOrigin = ParentOrigin.Center; - _text.AnchorPoint = AnchorPoint.Center; + _text.PivotPoint = AnchorPoint.Center; _text.HorizontalAlignment = HorizontalAlignment.Center; _text.PointSize = 32.0f; _text.TextColor = Color.Magenta; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs index b0f732f..0c16ce3 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016 Samsung Electronics Co., Ltd. +* Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -63,16 +63,16 @@ namespace ImageViewTest Log("Customized Application Initialize event handler"); window = Window.Instance; window.BackgroundColor = Color.Cyan; - window.TouchEvent += OnWindowTouched; - window.WheelEvent += OnWindowWheelMoved; + window.Touched += OnWindowTouched; + window.WheelRolled += OnWindowWheelMoved; window.KeyEvent += OnWindowKeyPressed; //window.EventProcessingFinished += OnWindowEventProcessingFinished; layer = window.GetDefaultLayer(); _layer1 = new Layer(); _layer2 = new Layer(); - window.AddLayer(_layer1); - window.AddLayer(_layer2); + window.Add(_layer1); + window.Add(_layer2); Log("_layer1.Behavior =" + _layer1.Behavior); if (_layer1.Behavior == Layer.LayerBehavior.LayerUI) { @@ -89,7 +89,7 @@ namespace ImageViewTest _imageView.ResourceUrl = resources+"/images/00_popup_bg.9.png"; //_imageView.Border = new Rectangle(100, 100, 100, 100); _imageView.ParentOrigin = ParentOrigin.TopLeft; - _imageView.AnchorPoint = AnchorPoint.TopLeft; + _imageView.PivotPoint = AnchorPoint.TopLeft; _imageView.Position = new Position(5.0f, 5.0f, 0.0f); _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f); _imageView.Size = new Size(200.0f, 80.0f, 0.0f); @@ -98,7 +98,7 @@ namespace ImageViewTest _pushButton1 = new PushButton(); _pushButton1.ParentOrigin = ParentOrigin.BottomLeft; - _pushButton1.AnchorPoint = AnchorPoint.BottomLeft; + _pushButton1.PivotPoint = AnchorPoint.BottomLeft; _pushButton1.LabelText = "start animation"; _pushButton1.Position = new Vector3(0.0f, window.Size.Height * 0.1f, 0.0f); _pushButton1.Clicked += OnPushButtonClicked1; @@ -106,7 +106,7 @@ namespace ImageViewTest _pushButton2 = new PushButton(); _pushButton2.ParentOrigin = ParentOrigin.BottomLeft; - _pushButton2.AnchorPoint = AnchorPoint.BottomLeft; + _pushButton2.PivotPoint = AnchorPoint.BottomLeft; _pushButton2.LabelText = "reload image with same URL"; _pushButton2.Position = new Vector3(0.0f, window.Size.Height * 0.2f, 0.0f); _pushButton2.Clicked += OnPushButtonClicked2; @@ -114,7 +114,7 @@ namespace ImageViewTest ImageView syncImage = new ImageView(); syncImage.ParentOrigin = ParentOrigin.CenterLeft; - syncImage.AnchorPoint = AnchorPoint.CenterLeft; + syncImage.PivotPoint = AnchorPoint.CenterLeft; syncImage.PositionUsesAnchorPoint = true; syncImage.Size2D = new Size2D(150, 150); syncImage.ResourceUrl = resources+"/images/gallery-3.jpg"; @@ -127,7 +127,7 @@ namespace ImageViewTest _map.Add(NpatchImageVisualProperty.SynchronousLoading, new PropertyValue(true)); ImageView nPatchImage = new ImageView(); nPatchImage.ParentOrigin = ParentOrigin.BottomLeft; - nPatchImage.AnchorPoint = AnchorPoint.BottomLeft; + nPatchImage.PivotPoint = AnchorPoint.BottomLeft; nPatchImage.PositionUsesAnchorPoint = true; nPatchImage.Size = new Size(300.0f, 100.0f, 0.0f); nPatchImage.ImageMap = _map; @@ -135,7 +135,7 @@ namespace ImageViewTest ImageView syncNineImage = new ImageView(); syncNineImage.ParentOrigin = ParentOrigin.CenterLeft; - syncNineImage.AnchorPoint = AnchorPoint.CenterLeft; + syncNineImage.PivotPoint = AnchorPoint.CenterLeft; syncNineImage.Position2D = new Position2D(0, 200); syncNineImage.PositionUsesAnchorPoint = true; syncNineImage.Size = new Size(150.0f, 150.0f, 0.0f); @@ -154,7 +154,7 @@ namespace ImageViewTest _imageView = new ImageView(); _imageView.ResourceUrl = resources+"/images/gallery-3.jpg"; _imageView.ParentOrigin = ParentOrigin.Center; - _imageView.AnchorPoint = AnchorPoint.Center; + _imageView.PivotPoint = AnchorPoint.Center; _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f); //_imageView.SetResizePolicy(ResizePolicyType.USE_NATURAL_SIZE, DimensionType.ALL_DIMENSIONS); layer.Add(_imageView); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs index 89e7067..17a33b7 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ namespace PositionUsesAnchorPointTest _window = Window.Instance; _text1 = new TextLabel("PositionUsesAnchorPoint"); _text1.ParentOrigin = ParentOrigin.Center; - _text1.AnchorPoint = AnchorPoint.Center; + _text1.PivotPoint = AnchorPoint.Center; _text1.Position = new Position(0, 0, 0); _text1.PositionUsesAnchorPoint = true; _text1.HorizontalAlignment = HorizontalAlignment.Center; @@ -72,7 +72,7 @@ namespace PositionUsesAnchorPointTest _text2 = new TextLabel("PositionNotUsesAnchorPoint"); _text2.ParentOrigin = ParentOrigin.Center; - _text2.AnchorPoint = AnchorPoint.Center; + _text2.PivotPoint = AnchorPoint.Center; _text2.Position = new Position(0, 0, 0); _text2.PositionUsesAnchorPoint = false; _text2.HorizontalAlignment = HorizontalAlignment.Center; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs index fdda0a6..6b7d18f 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/relative-vector.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -58,12 +58,12 @@ namespace RelativeVectorTest private void Initialize() { _window = Window.Instance; - _window.TouchEvent += OnWindowTouched; + _window.Touched += OnWindowTouched; _imageView = new ImageView(); _imageView.ResourceUrl = resources+"/images/gallery-3.jpg"; _imageView.ParentOrigin = ParentOrigin.Center; - _imageView.AnchorPoint = AnchorPoint.Center; + _imageView.PivotPoint = AnchorPoint.Center; _imageView.PixelArea = new RelativeVector4(0.0f, 0.0f, 0.0f, 0.0f); _window.GetDefaultLayer().Add(_imageView); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs index a93b762..bdcb83d 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs @@ -72,7 +72,7 @@ namespace ScrollViewTest Size windowSize = new Size(window.Size.Width, window.Size.Height, 0.0f); _scrollView.Size = new Size(windowSize.Width, windowSize.Height, 0.0f); _scrollView.ParentOrigin = ParentOrigin.Center; - _scrollView.AnchorPoint = AnchorPoint.Center; + _scrollView.PivotPoint = AnchorPoint.Center; window.GetDefaultLayer().Add(_scrollView); // Add actors to a scroll view with 3 pages @@ -86,7 +86,7 @@ namespace ScrollViewTest pageActor.WidthResizePolicy = ResizePolicyType.FillToParent; pageActor.HeightResizePolicy = ResizePolicyType.FillToParent; pageActor.ParentOrigin = ParentOrigin.Center; - pageActor.AnchorPoint = AnchorPoint.Center; + pageActor.PivotPoint = AnchorPoint.Center; pageActor.Position = new Position(pageColumn * windowSize.Width, pageRow * windowSize.Height, 0.0f); // Add images in a 3x4 grid layout for each page @@ -102,7 +102,7 @@ namespace ScrollViewTest int imageId = (row * imageColumns + column) % 2 + 1; ImageView imageView = new ImageView(resources+"/images/image-" + imageId + ".jpg"); imageView.ParentOrigin = ParentOrigin.Center; - imageView.AnchorPoint = AnchorPoint.Center; + imageView.PivotPoint = AnchorPoint.Center; imageView.Size = new Size(imageSize.X, imageSize.Y, imageSize.Z); imageView.Position = new Position( margin * 0.5f + (imageSize.X + margin) * column - windowSize.Width * 0.5f + imageSize.X * 0.5f, margin * 0.5f + (imageSize.Y + margin) * row - windowSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f ); @@ -128,20 +128,20 @@ namespace ScrollViewTest // Create a horizontal scroll bar in the bottom of scroll view (which is optional) _scrollBar = new ScrollBar(ScrollBar.Direction.Horizontal); _scrollBar.ParentOrigin = ParentOrigin.BottomLeft; - _scrollBar.AnchorPoint = AnchorPoint.TopLeft; + _scrollBar.PivotPoint = AnchorPoint.TopLeft; _scrollBar.WidthResizePolicy = ResizePolicyType.FitToChildren; _scrollBar.HeightResizePolicy = ResizePolicyType.FillToParent; _scrollBar.Orientation = new Rotation( new Radian( new Degree( 270.0f ) ), Vector3.ZAxis ); _scrollView.Add(_scrollBar); // Connect to the OnRelayout signal - _scrollView.OnRelayoutEvent += OnScrollViewRelayout; + _scrollView.Relayout += OnScrollViewRelayout; //_scrollView.Touched += OnTouch; - _scrollView.WheelMoved += Onwheel; + _scrollView.WheelRolled += Onwheel; _scrollView.FocusGained += OnKey; _text = new TextLabel("View Touch Event Handler Test"); _text.ParentOrigin = ParentOrigin.Center; - _text.AnchorPoint = AnchorPoint.Center; + _text.PivotPoint = AnchorPoint.Center; _text.HorizontalAlignment = HorizontalAlignment.Center; _text.PointSize = 20.0f; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/sibling-order-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/sibling-order-test.cs index fbd1942..b25a7f5 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/sibling-order-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/sibling-order-test.cs @@ -83,7 +83,7 @@ namespace SiblingOrderTest _view.LabelText = "view" + i; _view.MinimumSize = new Size2D(100, 50); _view.ParentOrigin = ParentOrigin.TopLeft; - _view.AnchorPoint = AnchorPoint.TopLeft; + _view.PivotPoint = AnchorPoint.TopLeft; _view.Position2D = _myPos + new Position2D(20 * i, 10 * i); _window.GetDefaultLayer().Add(_view); @@ -102,7 +102,7 @@ namespace SiblingOrderTest _view.LabelText = "view" + i; _view.MinimumSize = new Size2D(100, 50); _view.ParentOrigin = ParentOrigin.TopLeft; - _view.AnchorPoint = AnchorPoint.TopLeft; + _view.PivotPoint = AnchorPoint.TopLeft; _view.Position2D = _myPos + new Position2D(20 * i, 10 * i); _view.SiblingOrder = i; @@ -122,7 +122,7 @@ namespace SiblingOrderTest _view.LabelText = "view" + i; _view.MinimumSize = new Size2D(100, 50); _view.ParentOrigin = ParentOrigin.TopLeft; - _view.AnchorPoint = AnchorPoint.TopLeft; + _view.PivotPoint = AnchorPoint.TopLeft; _view.Position2D = _myPos + new Position2D(20 * i, 10 * i); _view.SiblingOrder = 10-i; @@ -142,7 +142,7 @@ namespace SiblingOrderTest _view.LabelText = "view" + i; _view.MinimumSize = new Size2D(100, 50); _view.ParentOrigin = ParentOrigin.TopLeft; - _view.AnchorPoint = AnchorPoint.TopLeft; + _view.PivotPoint = AnchorPoint.TopLeft; _view.Position2D = _myPos + new Position2D(20 * i, 10 * i); if (i<5) { @@ -169,7 +169,7 @@ namespace SiblingOrderTest _view.LabelText = "view" + i; _view.MinimumSize = new Size2D(100, 50); _view.ParentOrigin = ParentOrigin.TopLeft; - _view.AnchorPoint = AnchorPoint.TopLeft; + _view.PivotPoint = AnchorPoint.TopLeft; _view.Position2D = _myPos + new Position2D(20 * i, 10 * i); if (i<5) { diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs index fcefdbb..bdeb8d7 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/test1.cs @@ -95,7 +95,7 @@ namespace Test1 _view.MinimumSize = new Size2D(100, 50); _view.LabelText = "sibling" + i; _view.ParentOrigin = ParentOrigin.TopLeft; - _view.AnchorPoint = AnchorPoint.TopLeft; + _view.PivotPoint = AnchorPoint.TopLeft; _view.Position2D = _myPos + new Position2D(20 * i, 10 * i); _view.Clicked += (sender, ee) => { @@ -125,7 +125,7 @@ namespace Test1 } _txt.ParentOrigin = ParentOrigin.TopLeft; - _txt.AnchorPoint = AnchorPoint.TopLeft; + _txt.PivotPoint = AnchorPoint.TopLeft; _txt.Text = "on top: sibling#, sibling order=?"; _txt.Position2D = _myPos + new Position2D(-50, 200); _txt.TextColor = Color.Blue; @@ -178,7 +178,7 @@ namespace Test1 VisualTest _visualTest = new VisualTest(); _visualTest.TextVisual = "Hello NUI Text Visual!"; _visualTest.ParentOrigin = ParentOrigin.TopLeft; - _visualTest.AnchorPoint = AnchorPoint.TopLeft; + _visualTest.PivotPoint = AnchorPoint.TopLeft; _visualTest.Size2D = new Size2D(600, 200); _visualTest.Position2D = new Position2D(50, 400); _visualTest.BackgroundColor = Color.Yellow; @@ -223,7 +223,7 @@ namespace Test1 /* TEST CODE */ View view = new View(); view.ParentOrigin = ParentOrigin.TopLeft; - view.AnchorPoint = AnchorPoint.TopLeft; + view.PivotPoint = AnchorPoint.TopLeft; view.MinimumSize = new Size2D(100, 100); view.BackgroundColor = Color.Red; _window.GetDefaultLayer().Add(view); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs index b1b5683..f5568ed 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs @@ -1,5 +1,5 @@ /* -* Copyright (c) 2016 Samsung Electronics Co., Ltd. +* Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -64,15 +64,15 @@ namespace UserAlphaFunctionTest Log("Initialize() is called!"); Window window = Window.Instance; window.BackgroundColor = Color.White; - window.TouchEvent += OnWindowTouched; - window.TouchEvent += OnWindowTouched2; + window.Touched += OnWindowTouched; + window.Touched += OnWindowTouched2; //window.EventProcessingFinished += OnEventProcessingFinished; - window.WheelEvent += OnWindowWheelEvent; + window.WheelRolled += OnWindowWheelEvent; // Add a _text label to the window _text = new TextLabel("Hello Mono World"); _text.ParentOrigin = ParentOrigin.BottomCenter; - _text.AnchorPoint = AnchorPoint.BottomCenter; + _text.PivotPoint = AnchorPoint.BottomCenter; _text.HorizontalAlignment = HorizontalAlignment.Center; _text.PointSize = 32.0f; window.GetDefaultLayer().Add(_text); @@ -81,17 +81,17 @@ namespace UserAlphaFunctionTest _view1.Size = new Vector3(200.0f, 200.0f, 0.0f); _view1.BackgroundColor = Color.Green; _view1.ParentOrigin = ParentOrigin.Center; - _view1.AnchorPoint = AnchorPoint.Center; + _view1.PivotPoint = AnchorPoint.Center; _view1.WidthResizePolicy = ResizePolicyType.Fixed; _view1.HeightResizePolicy = ResizePolicyType.Fixed; - _view1.OnWindowEvent += OnWindow; + _view1.AddedToWindow += OnWindow; window.GetDefaultLayer().Add(_view1); _view2 = new View(); _view2.BackgroundColor = Color.Red; _view2.Size = new Vector3(50.0f, 50.0f, 0.0f); _view2.ParentOrigin = ParentOrigin.TopLeft; - _view2.AnchorPoint = AnchorPoint.TopLeft; + _view2.PivotPoint = AnchorPoint.TopLeft; _view2.WidthResizePolicy = ResizePolicyType.Fixed; _view2.HeightResizePolicy = ResizePolicyType.Fixed; _view1.Add(_view2); @@ -100,7 +100,7 @@ namespace UserAlphaFunctionTest _view3.BackgroundColor = Color.Blue; _view3.Size = new Vector3(50.0f, 50.0f, 0.0f); _view3.ParentOrigin = ParentOrigin.TopLeft; - _view3.AnchorPoint = AnchorPoint.TopLeft; + _view3.PivotPoint = AnchorPoint.TopLeft; _view3.WidthResizePolicy = ResizePolicyType.Fixed; _view3.HeightResizePolicy = ResizePolicyType.Fixed; _view1.Add(_view3); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs index 7d3e306..f5e07e0 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs @@ -49,7 +49,7 @@ namespace MyCSharpExample Window.Instance.GetDefaultLayer().Add(view[i]); view[i].FocusGained += FocusNavigationSample_FocusGained; view[i].FocusLost += FocusNavigationSample_FocusLost; - view[i].KeyEvent += FocusNavigationSample_KeyEvent; + view[i].Key += FocusNavigationSample_KeyEvent; } view[0].RightFocusableView = view[1]; @@ -60,7 +60,7 @@ namespace MyCSharpExample FocusManager.Instance.SetCurrentFocusView(view[0]); FocusManager.Instance.PreFocusChange += Instance_PreFocusChange; - Window.Instance.TouchEvent += Instance_Touch; + Window.Instance.Touched += Instance_Touch; } private void Instance_Touch(object sender, Window.TouchEventArgs e) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs index adf14e2..9f6917e 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs @@ -65,7 +65,7 @@ namespace VisaulAnimationExample TableView titleLayout = new TableView(2, 1); titleLayout.Name = ("TitleLayout"); - titleLayout.AnchorPoint = AnchorPoint.TopLeft; + titleLayout.PivotPoint = AnchorPoint.TopLeft; titleLayout.Position2D = new Position2D(10, 10); titleLayout.Size2D = new Size2D((int)(window.Size.Width * 0.9f), (int)(window.Size.Height * 0.9f)); titleLayout.SetCellPadding(new Size2D(10, 10)); @@ -85,7 +85,7 @@ namespace VisaulAnimationExample contentLayout.Name = ("ContentLayout"); contentLayout.WidthResizePolicy = ResizePolicyType.FillToParent; contentLayout.HeightResizePolicy = ResizePolicyType.FillToParent; - contentLayout.AnchorPoint = AnchorPoint.TopLeft; + contentLayout.PivotPoint = AnchorPoint.TopLeft; contentLayout.SetCellPadding(new Size2D(10, 10)); contentLayout.BackgroundColor = Color.Magenta; titleLayout.AddChild(contentLayout, new TableView.CellPosition(1, 0)); @@ -117,7 +117,7 @@ namespace VisaulAnimationExample _shadowButton.LabelText = "Toggle Transition"; _shadowButton.Name = ("ToggleTransition"); _shadowButton.ParentOrigin = ParentOrigin.Center; - _shadowButton.AnchorPoint = AnchorPoint.Center; + _shadowButton.PivotPoint = AnchorPoint.Center; _shadowButton.Clicked += (obj, ev) => { _active = !_active; @@ -165,7 +165,7 @@ namespace VisaulAnimationExample PushButton svgButton = new PushButton(); svgButton.LabelText = "SVG Visual Test"; svgButton.Name = ("svg_visual_test"); - svgButton.AnchorPoint = AnchorPoint.Center; + svgButton.PivotPoint = AnchorPoint.Center; svgButton.WidthResizePolicy = ResizePolicyType.FillToParent; svgButton.HeightResizePolicy = ResizePolicyType.FillToParent; svgButton.Clicked += (obj, ev) => @@ -205,7 +205,7 @@ namespace VisaulAnimationExample PushButton gifButton = new PushButton(); gifButton.LabelText = "AnimatedImage Visual Test"; gifButton.Name = ("gif_visual_test"); - gifButton.AnchorPoint = AnchorPoint.Center; + gifButton.PivotPoint = AnchorPoint.Center; gifButton.WidthResizePolicy = ResizePolicyType.FillToParent; gifButton.HeightResizePolicy = ResizePolicyType.FillToParent; gifButton.Clicked += (obj, ev) => diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test2.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test2.cs index a9f6298..598cbd7 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test2.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test2.cs @@ -66,7 +66,7 @@ namespace VisaulAnimationExample TableView titleLayout = new TableView(2, 1); titleLayout.Name = ("TitleLayout"); - titleLayout.AnchorPoint = AnchorPoint.TopLeft; + titleLayout.PivotPoint = AnchorPoint.TopLeft; titleLayout.Position2D = new Position2D(10, 10); titleLayout.Size2D = new Size2D((int)(window.Size.Width * 0.9f), (int)(window.Size.Height * 0.9f)); titleLayout.SetCellPadding(new Size2D(10, 10)); @@ -86,7 +86,7 @@ namespace VisaulAnimationExample contentLayout.Name = ("ContentLayout"); contentLayout.WidthResizePolicy = ResizePolicyType.FillToParent; contentLayout.HeightResizePolicy = ResizePolicyType.FillToParent; - contentLayout.AnchorPoint = AnchorPoint.TopLeft; + contentLayout.PivotPoint = AnchorPoint.TopLeft; contentLayout.SetCellPadding(new Size2D(10, 10)); contentLayout.BackgroundColor = Color.Magenta; titleLayout.AddChild(contentLayout, new TableView.CellPosition(1, 0)); @@ -118,7 +118,7 @@ namespace VisaulAnimationExample _shadowButton1.LabelText = "Toggle Transition Position"; _shadowButton1.Name = ("ToggleTransition"); _shadowButton1.ParentOrigin = ParentOrigin.Center; - _shadowButton1.AnchorPoint = AnchorPoint.Center; + _shadowButton1.PivotPoint = AnchorPoint.Center; _shadowButton1.Clicked += (obj, ev) => { _active1 = !_active1; @@ -156,7 +156,7 @@ namespace VisaulAnimationExample _shadowButton2.LabelText = "Toggle Transition Opacity"; _shadowButton2.Name = ("ToggleTransition"); _shadowButton2.ParentOrigin = ParentOrigin.Center; - _shadowButton2.AnchorPoint = AnchorPoint.Center; + _shadowButton2.PivotPoint = AnchorPoint.Center; _shadowButton2.Clicked += (obj, ev) => { _active2 = !_active2; @@ -194,7 +194,7 @@ namespace VisaulAnimationExample _shadowButton3.LabelText = "Toggle Transition MixColor"; _shadowButton3.Name = ("ToggleTransition"); _shadowButton3.ParentOrigin = ParentOrigin.Center; - _shadowButton3.AnchorPoint = AnchorPoint.Center; + _shadowButton3.PivotPoint = AnchorPoint.Center; _shadowButton3.Clicked += (obj, ev) => { _active3 = !_active3; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs index f2fef89..dfcc5c9 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -61,7 +61,7 @@ namespace VisualViewTest /* Create a visual view. */ _visualView = new VisualView(); _visualView.ParentOrigin = ParentOrigin.TopLeft; - _visualView.AnchorPoint = AnchorPoint.TopLeft; + _visualView.PivotPoint = AnchorPoint.TopLeft; _visualView.Size = new Size(window.Size.Width, window.Size.Height, 0.0f); /* color visual */ @@ -260,12 +260,12 @@ namespace VisualViewTest npatchImageVisualMap1.Border = new Rectangle(100, 100, 100, 100); _visualView.AddVisual("npatchImageVisual1", npatchImageVisualMap1); - _window = this.Window; + _window = Window.Instance; _window.WindowFocusChanged += (sender, ee) => { cnt++; Tizen.Log.Debug("NUI", "[WindowFocusTest] WindowFocusChanged event comes! focus gained=" + ee.FocusGained); - imageVisualMap1.Size += new Vector2(50.0f, 50.0f); + imageVisualMap1.Size += new Size2D(50, 50); imageVisualMap1.Position += new Vector2(20.0f, 20.0f); textVisualMap1.Text = "Hello Goodbye" + cnt; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs index 42bb3be..987299a 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs @@ -43,7 +43,7 @@ namespace VisualViewTest2 Window.Instance.GetDefaultLayer().Add(view[i]); view[i].FocusGained += VisualSample_FocusGained; view[i].FocusLost += VisualSample_FocusLost; - view[i].KeyEvent += VisualSample_KeyEvent; + view[i].Key += VisualSample_KeyEvent; } view[0].RightFocusableView = view[1]; @@ -125,7 +125,7 @@ namespace VisualViewTest2 guide = new TextLabel(); - guide.AnchorPoint = AnchorPoint.TopLeft; + guide.PivotPoint = AnchorPoint.TopLeft; guide.Size2D = new Size2D(800, 200); guide.Padding = new Vector4(50, 50, 50, 50); guide.MultiLine = true; @@ -139,8 +139,8 @@ namespace VisualViewTest2 Window.Instance.KeyEvent += Instance_Key; FocusManager.Instance.SetCurrentFocusView(view[0]); - Window.Instance.TouchEvent += Instance_Touch; - _window = this.Window; + Window.Instance.Touched += Instance_Touch; + _window = Window.Instance; _window.WindowFocusChanged += _window_WindowFocusChanged; } diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs index 83d58df..7f89590 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -59,7 +59,7 @@ namespace VisualViewTest3 /* Create a visual view. */ _visualView = new VisualView(); _visualView.ParentOrigin = ParentOrigin.TopLeft; - _visualView.AnchorPoint = AnchorPoint.TopLeft; + _visualView.PivotPoint = AnchorPoint.TopLeft; _visualView.Size = new Size(window.Size.Width, window.Size.Height, 0.0f); /* color visual */ @@ -89,11 +89,11 @@ namespace VisualViewTest3 imageVisualMap2.DepthIndex = 9.0f; _visualView.AddVisual("imageVisual2", imageVisualMap2); /* If imageVisual2 added first, the it will be covered by imageVisual1. - so, we need to set their depth index to ensure they all can be showed. + so, we need to set their depth index to ensure they all can be showed. */ _visualView.AddVisual("imageVisual1", imageVisualMap1); - _window = this.Window; + _window = Window.Instance; _window.WindowFocusChanged += (sender, ee) => { cnt++; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs index 2d82fa9..409117c 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs @@ -52,7 +52,7 @@ namespace VisualsUsingCustomView contentLayout.Name = "ContentLayout"; //contentLayout.WidthResizePolicy = ResizePolicyType.FillToParent; //contentLayout.HeightResizePolicy = ResizePolicyType.FillToParent; - contentLayout.AnchorPoint = AnchorPoint.Center; + contentLayout.PivotPoint = AnchorPoint.Center; contentLayout.ParentOrigin = ParentOrigin.Center; contentLayout.Size = new Vector3(window.Size.Width, window.Size.Height, 0.0f); contentLayout.SetCellPadding(new Size2D(5, 5)); diff --git a/src/Tizen.NUI/src/internal/Camera.cs b/src/Tizen.NUI/src/internal/Camera.cs index b7fe34d..9670614 100755 --- a/src/Tizen.NUI/src/internal/Camera.cs +++ b/src/Tizen.NUI/src/internal/Camera.cs @@ -361,7 +361,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.FIELD_OF_VIEW).Get(ref temp); + GetProperty(Camera.Property.FIELD_OF_VIEW).Get(out temp); return temp; } set @@ -374,7 +374,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.ASPECT_RATIO).Get(ref temp); + GetProperty(Camera.Property.ASPECT_RATIO).Get(out temp); return temp; } set @@ -387,7 +387,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.NEAR_PLANE_DISTANCE).Get(ref temp); + GetProperty(Camera.Property.NEAR_PLANE_DISTANCE).Get(out temp); return temp; } set @@ -400,7 +400,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.FAR_PLANE_DISTANCE).Get(ref temp); + GetProperty(Camera.Property.FAR_PLANE_DISTANCE).Get(out temp); return temp; } set @@ -413,7 +413,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.LEFT_PLANE_DISTANCE).Get(ref temp); + GetProperty(Camera.Property.LEFT_PLANE_DISTANCE).Get(out temp); return temp; } set @@ -426,7 +426,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.RIGHT_PLANE_DISTANCE).Get(ref temp); + GetProperty(Camera.Property.RIGHT_PLANE_DISTANCE).Get(out temp); return temp; } set @@ -439,7 +439,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.TOP_PLANE_DISTANCE).Get(ref temp); + GetProperty(Camera.Property.TOP_PLANE_DISTANCE).Get(out temp); return temp; } set @@ -452,7 +452,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Camera.Property.BOTTOM_PLANE_DISTANCE).Get(ref temp); + GetProperty(Camera.Property.BOTTOM_PLANE_DISTANCE).Get(out temp); return temp; } set @@ -496,7 +496,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(Camera.Property.INVERT_Y_AXIS).Get(ref temp); + GetProperty(Camera.Property.INVERT_Y_AXIS).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs index 850be0f..9ff7657 100755 --- a/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs +++ b/src/Tizen.NUI/src/internal/CustomAlgorithmInterface.cs @@ -107,7 +107,7 @@ namespace Tizen.NUI return ret; } - public CustomAlgorithmInterface() : this(NDalicPINVOKE.new_CustomAlgorithmInterface(), true) + internal CustomAlgorithmInterface() : this(NDalicPINVOKE.new_CustomAlgorithmInterface(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); SwigDirectorConnect(); @@ -140,7 +140,7 @@ namespace Tizen.NUI return View.getCPtr(GetNextFocusableView(new View(current, true), new View(proposed, true), (View.FocusDirection)direction)).Handle; } - public delegate global::System.IntPtr SwigDelegateCustomAlgorithmInterface_0(global::System.IntPtr current, global::System.IntPtr proposed, int direction); + internal delegate global::System.IntPtr SwigDelegateCustomAlgorithmInterface_0(global::System.IntPtr current, global::System.IntPtr proposed, int direction); private SwigDelegateCustomAlgorithmInterface_0 swigDelegate0; diff --git a/src/Tizen.NUI/src/internal/FrameBuffer.cs b/src/Tizen.NUI/src/internal/FrameBuffer.cs index 79240c1..a0c7666 100755 --- a/src/Tizen.NUI/src/internal/FrameBuffer.cs +++ b/src/Tizen.NUI/src/internal/FrameBuffer.cs @@ -73,93 +73,8 @@ namespace Tizen.NUI base.Dispose(type); } - public class Attachment : global::System.IDisposable + public class Attachment { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Attachment(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Attachment obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Attachment() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_FrameBuffer_Attachment(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - public Attachment() : this(NDalicPINVOKE.new_FrameBuffer_Attachment(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public enum Mask { NONE = 0, @@ -167,7 +82,6 @@ namespace Tizen.NUI STENCIL = 1 << 1, DEPTH_STENCIL = DEPTH | STENCIL } - } public FrameBuffer(uint width, uint height, uint attachments) : this(NDalicPINVOKE.FrameBuffer_New(width, height, attachments), true) @@ -175,24 +89,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public FrameBuffer(FrameBuffer handle) : this(NDalicPINVOKE.new_FrameBuffer__SWIG_1(FrameBuffer.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static FrameBuffer DownCast(BaseHandle handle) - { - FrameBuffer ret = new FrameBuffer(NDalicPINVOKE.FrameBuffer_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public FrameBuffer Assign(FrameBuffer handle) - { - FrameBuffer ret = new FrameBuffer(NDalicPINVOKE.FrameBuffer_Assign(swigCPtr, FrameBuffer.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public void AttachColorTexture(Texture texture) { diff --git a/src/Tizen.NUI/src/internal/GestureDetector.cs b/src/Tizen.NUI/src/internal/GestureDetector.cs index 16e1c6f..c78d500 100755 --- a/src/Tizen.NUI/src/internal/GestureDetector.cs +++ b/src/Tizen.NUI/src/internal/GestureDetector.cs @@ -99,14 +99,14 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public uint GetAttachedActorCount() + public uint GetAttachedViewCount() { uint ret = NDalicPINVOKE.GestureDetector_GetAttachedActorCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public View GetAttachedActor(uint index) + public View GetAttachedView(uint index) { View ret = new View(NDalicPINVOKE.GestureDetector_GetAttachedActor(swigCPtr, index), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/ImfManager.cs b/src/Tizen.NUI/src/internal/ImfManager.cs index 3f6f011..163a962 100755 --- a/src/Tizen.NUI/src/internal/ImfManager.cs +++ b/src/Tizen.NUI/src/internal/ImfManager.cs @@ -14,7 +14,7 @@ namespace Tizen.NUI using System.Runtime.InteropServices; - public class ImfManager : BaseHandle + internal class ImfManager : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/ItemView.cs b/src/Tizen.NUI/src/internal/ItemView.cs index 85728d1..b89d326 100755 --- a/src/Tizen.NUI/src/internal/ItemView.cs +++ b/src/Tizen.NUI/src/internal/ItemView.cs @@ -66,7 +66,7 @@ namespace Tizen.NUI //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -96,95 +96,9 @@ namespace Tizen.NUI } } - public class Property : global::System.IDisposable + public class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ItemView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - public static readonly int LAYOUT = NDalicManualPINVOKE.ItemView_Property_LAYOUT_get(); - - public Property() : this(NDalicPINVOKE.new_ItemView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static readonly int MINIMUM_SWIPE_SPEED = NDalicPINVOKE.ItemView_Property_MINIMUM_SWIPE_SPEED_get(); public static readonly int MINIMUM_SWIPE_DISTANCE = NDalicPINVOKE.ItemView_Property_MINIMUM_SWIPE_DISTANCE_get(); public static readonly int WHEEL_SCROLL_DISTANCE_STEP = NDalicPINVOKE.ItemView_Property_WHEEL_SCROLL_DISTANCE_STEP_get(); @@ -196,7 +110,6 @@ namespace Tizen.NUI public static readonly int SCROLL_DIRECTION = NDalicPINVOKE.ItemView_Property_SCROLL_DIRECTION_get(); public static readonly int LAYOUT_ORIENTATION = NDalicPINVOKE.ItemView_Property_LAYOUT_ORIENTATION_get(); public static readonly int SCROLL_CONTENT_SIZE = NDalicPINVOKE.ItemView_Property_SCROLL_CONTENT_SIZE_get(); - } public ItemView(ItemFactory factory) : this(NDalicPINVOKE.ItemView_New(ItemFactory.getCPtr(factory)), true) @@ -204,19 +117,8 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ItemView(ItemView itemView) : this(NDalicPINVOKE.new_ItemView__SWIG_1(ItemView.getCPtr(itemView)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public ItemView Assign(ItemView itemView) - { - ItemView ret = new ItemView(NDalicPINVOKE.ItemView_Assign(swigCPtr, ItemView.getCPtr(itemView)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ItemView DownCast(BaseHandle handle) + internal new static ItemView DownCast(BaseHandle handle) { ItemView ret = new ItemView(NDalicPINVOKE.ItemView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -454,20 +356,12 @@ namespace Tizen.NUI return ret; } - public enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - public float MinimumSwipeSpeed { get { float temp = 0.0f; - GetProperty(ItemView.Property.MINIMUM_SWIPE_SPEED).Get(ref temp); + GetProperty(ItemView.Property.MINIMUM_SWIPE_SPEED).Get(out temp); return temp; } set @@ -480,7 +374,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.MINIMUM_SWIPE_DISTANCE).Get(ref temp); + GetProperty(ItemView.Property.MINIMUM_SWIPE_DISTANCE).Get(out temp); return temp; } set @@ -493,7 +387,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get(ref temp); + GetProperty(ItemView.Property.WHEEL_SCROLL_DISTANCE_STEP).Get(out temp); return temp; } set @@ -506,7 +400,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(ItemView.Property.SNAP_TO_ITEM_ENABLED).Get(ref temp); + GetProperty(ItemView.Property.SNAP_TO_ITEM_ENABLED).Get(out temp); return temp; } set @@ -519,7 +413,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.REFRESH_INTERVAL).Get(ref temp); + GetProperty(ItemView.Property.REFRESH_INTERVAL).Get(out temp); return temp; } set @@ -532,7 +426,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.LAYOUT_POSITION).Get(ref temp); + GetProperty(ItemView.Property.LAYOUT_POSITION).Get(out temp); return temp; } set @@ -545,7 +439,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.SCROLL_SPEED).Get(ref temp); + GetProperty(ItemView.Property.SCROLL_SPEED).Get(out temp); return temp; } set @@ -558,7 +452,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.OVERSHOOT).Get(ref temp); + GetProperty(ItemView.Property.OVERSHOOT).Get(out temp); return temp; } set @@ -584,7 +478,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(ItemView.Property.LAYOUT_ORIENTATION).Get(ref temp); + GetProperty(ItemView.Property.LAYOUT_ORIENTATION).Get(out temp); return temp; } set @@ -597,7 +491,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ItemView.Property.SCROLL_CONTENT_SIZE).Get(ref temp); + GetProperty(ItemView.Property.SCROLL_CONTENT_SIZE).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/KeyInputFocusManager.cs b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs similarity index 96% rename from src/Tizen.NUI/src/public/KeyInputFocusManager.cs rename to src/Tizen.NUI/src/internal/KeyInputFocusManager.cs index 03ee6cc..6a442c3 100755 --- a/src/Tizen.NUI/src/public/KeyInputFocusManager.cs +++ b/src/Tizen.NUI/src/internal/KeyInputFocusManager.cs @@ -12,8 +12,7 @@ using Tizen.NUI.BaseComponents; namespace Tizen.NUI { - - public class KeyInputFocusManager : BaseHandle + internal class KeyInputFocusManager : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -60,7 +59,7 @@ namespace Tizen.NUI base.Dispose(type); } - public KeyInputFocusManager() : this(NDalicPINVOKE.new_KeyInputFocusManager(), true) + private KeyInputFocusManager() : this(NDalicPINVOKE.new_KeyInputFocusManager(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/LinearConstrainer.cs b/src/Tizen.NUI/src/internal/LinearConstrainer.cs index 34e8636..f02e0bd 100755 --- a/src/Tizen.NUI/src/internal/LinearConstrainer.cs +++ b/src/Tizen.NUI/src/internal/LinearConstrainer.cs @@ -163,7 +163,6 @@ namespace Tizen.NUI internal static readonly int VALUE = NDalicPINVOKE.LinearConstrainer_Property_VALUE_get(); internal static readonly int PROGRESS = NDalicPINVOKE.LinearConstrainer_Property_PROGRESS_get(); - } public LinearConstrainer() : this(NDalicPINVOKE.LinearConstrainer_New(), true) @@ -171,7 +170,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public new static LinearConstrainer DownCast(BaseHandle handle) + internal new static LinearConstrainer DownCast(BaseHandle handle) { LinearConstrainer ret = new LinearConstrainer(NDalicPINVOKE.LinearConstrainer_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/Model3dView.cs b/src/Tizen.NUI/src/internal/Model3dView.cs index 269a0d1..f43f6df 100755 --- a/src/Tizen.NUI/src/internal/Model3dView.cs +++ b/src/Tizen.NUI/src/internal/Model3dView.cs @@ -207,14 +207,6 @@ namespace Tizen.NUI return ret; } - public enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - public enum IluminationTypeEnum { DIFFUSE, @@ -266,7 +258,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(Model3dView.Property.ILLUMINATION_TYPE).Get(ref temp); + GetProperty(Model3dView.Property.ILLUMINATION_TYPE).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/NDalic.cs b/src/Tizen.NUI/src/internal/NDalic.cs index cb47707..d74ddbd 100755 --- a/src/Tizen.NUI/src/internal/NDalic.cs +++ b/src/Tizen.NUI/src/internal/NDalic.cs @@ -97,278 +97,6 @@ namespace Tizen.NUI return ret; } - public static Radian ANGLE_360 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_360_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_315 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_315_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_270 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_270_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_225 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_225_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_180 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_180_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_135 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_135_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_120 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_120_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_90 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_90_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_60 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_60_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_45 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_45_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_30 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_30_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static Radian ANGLE_0 - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ANGLE_0_get(); - Radian ret = (cPtr == global::System.IntPtr.Zero) ? null : new Radian(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static bool EqualTo(Degree lhs, Degree rhs) - { - bool ret = NDalicPINVOKE.EqualTo__SWIG_5(Degree.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Degree lhs, Degree rhs) - { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_4(Degree.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Degree Clamp(Degree angle, float min, float max) - { - Degree ret = new Degree(NDalicPINVOKE.Clamp__SWIG_3(Degree.getCPtr(angle), min, max), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool EqualTo(Radian lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.EqualTo__SWIG_6(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Radian lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_5(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool EqualTo(Radian lhs, Degree rhs) - { - bool ret = NDalicPINVOKE.EqualTo__SWIG_7(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Radian lhs, Degree rhs) - { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_6(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool EqualTo(Degree lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.EqualTo__SWIG_8(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool NotEqualTo(Degree lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.NotEqualTo__SWIG_7(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool GreaterThan(Radian lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.GreaterThan__SWIG_0(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool GreaterThan(Radian lhs, Degree rhs) - { - bool ret = NDalicPINVOKE.GreaterThan__SWIG_1(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool GreaterThan(Degree lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.GreaterThan__SWIG_2(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool LessThan(Radian lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.LessThan__SWIG_0(Radian.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool LessThan(Radian lhs, Degree rhs) - { - bool ret = NDalicPINVOKE.LessThan__SWIG_1(Radian.getCPtr(lhs), Degree.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool LessThan(Degree lhs, Radian rhs) - { - bool ret = NDalicPINVOKE.LessThan__SWIG_2(Degree.getCPtr(lhs), Radian.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Radian Multiply(Radian lhs, float rhs) - { - Radian ret = new Radian(NDalicPINVOKE.Multiply(Radian.getCPtr(lhs), rhs), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Radian Subtract(Radian arg0) - { - Radian ret = new Radian(NDalicPINVOKE.Subtract(Radian.getCPtr(arg0)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Radian Clamp(Radian angle, float min, float max) - { - Radian ret = new Radian(NDalicPINVOKE.Clamp__SWIG_4(Radian.getCPtr(angle), min, max), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static float Range(float f0, float f1) - { - float ret = NDalicPINVOKE.Range(f0, f1); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static Vector4 Axis() - { - Vector4 ret = new Vector4(NDalicPINVOKE.Axis(), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public static bool EqualTo(AngleAxis lhs, AngleAxis rhs) { bool ret = NDalicPINVOKE.EqualTo__SWIG_9(AngleAxis.getCPtr(lhs), AngleAxis.getCPtr(rhs)); @@ -453,13 +181,6 @@ namespace Tizen.NUI return ret; } - public static bool LessThan(BaseHandle lhs, BaseHandle rhs) - { - bool ret = NDalicPINVOKE.LessThan__SWIG_3(BaseHandle.getCPtr(lhs), BaseHandle.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public static PropertyCondition LessThanCondition(float arg) { PropertyCondition ret = new PropertyCondition(NDalicPINVOKE.LessThanCondition(arg), true); @@ -930,7 +651,7 @@ namespace Tizen.NUI } } - public static float MACHINE_EPSILON_0 + internal static float MACHINE_EPSILON_0 { get { @@ -940,7 +661,7 @@ namespace Tizen.NUI } } - public static float MACHINE_EPSILON_1 + internal static float MACHINE_EPSILON_1 { get { @@ -950,7 +671,7 @@ namespace Tizen.NUI } } - public static float MACHINE_EPSILON_10 + internal static float MACHINE_EPSILON_10 { get { @@ -960,7 +681,7 @@ namespace Tizen.NUI } } - public static float MACHINE_EPSILON_100 + internal static float MACHINE_EPSILON_100 { get { @@ -970,7 +691,7 @@ namespace Tizen.NUI } } - public static float MACHINE_EPSILON_1000 + internal static float MACHINE_EPSILON_1000 { get { @@ -980,7 +701,7 @@ namespace Tizen.NUI } } - public static float MACHINE_EPSILON_10000 + internal static float MACHINE_EPSILON_10000 { get { @@ -990,67 +711,7 @@ namespace Tizen.NUI } } - public static float PI - { - get - { - float ret = NDalicPINVOKE.PI_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float PI_2 - { - get - { - float ret = NDalicPINVOKE.PI_2_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float PI_4 - { - get - { - float ret = NDalicPINVOKE.PI_4_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float PI_OVER_180 - { - get - { - float ret = NDalicPINVOKE.PI_OVER_180_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static float ONE80_OVER_PI - { - get - { - float ret = NDalicPINVOKE.ONE80_OVER_PI_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static ResizePolicyType ResizePolicyDefault - { - get - { - ResizePolicyType ret = (ResizePolicyType)NDalicPINVOKE.ResizePolicyDefault_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static PixelFormat FIRST_VALID_PIXEL_FORMAT + internal static PixelFormat FIRST_VALID_PIXEL_FORMAT { get { @@ -1060,7 +721,7 @@ namespace Tizen.NUI } } - public static PixelFormat LAST_VALID_PIXEL_FORMAT + internal static PixelFormat LAST_VALID_PIXEL_FORMAT { get { @@ -1070,27 +731,27 @@ namespace Tizen.NUI } } - public static bool HasAlpha(PixelFormat pixelformat) + internal static bool HasAlpha(PixelFormat pixelformat) { bool ret = NDalicPINVOKE.HasAlpha((int)pixelformat); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static uint GetBytesPerPixel(PixelFormat pixelFormat) + internal static uint GetBytesPerPixel(PixelFormat pixelFormat) { uint ret = NDalicPINVOKE.GetBytesPerPixel((int)pixelFormat); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static void GetAlphaOffsetAndMask(PixelFormat pixelFormat, SWIGTYPE_p_int byteOffset, SWIGTYPE_p_int bitMask) + internal static void GetAlphaOffsetAndMask(PixelFormat pixelFormat, SWIGTYPE_p_int byteOffset, SWIGTYPE_p_int bitMask) { NDalicPINVOKE.GetAlphaOffsetAndMask((int)pixelFormat, SWIGTYPE_p_int.getCPtr(byteOffset), SWIGTYPE_p_int.getCPtr(bitMask)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static uint POSITIVE_X + internal static uint POSITIVE_X { get { @@ -1100,7 +761,7 @@ namespace Tizen.NUI } } - public static uint NEGATIVE_X + internal static uint NEGATIVE_X { get { @@ -1110,7 +771,7 @@ namespace Tizen.NUI } } - public static uint POSITIVE_Y + internal static uint POSITIVE_Y { get { @@ -1120,7 +781,7 @@ namespace Tizen.NUI } } - public static uint NEGATIVE_Y + internal static uint NEGATIVE_Y { get { @@ -1130,7 +791,7 @@ namespace Tizen.NUI } } - public static uint POSITIVE_Z + internal static uint POSITIVE_Z { get { @@ -1140,7 +801,7 @@ namespace Tizen.NUI } } - public static uint NEGATIVE_Z + internal static uint NEGATIVE_Z { get { @@ -1164,12 +825,6 @@ namespace Tizen.NUI return ret; } - public static void UnparentAndReset(View view) - { - NDalicPINVOKE.UnparentAndReset(View.getCPtr(view)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static void Raise(View view) { NDalicPINVOKE.Raise(View.getCPtr(view)); @@ -1206,72 +861,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static ViewVisibilityChangedSignal VisibilityChangedSignal(View view) - { - ViewVisibilityChangedSignal ret = new ViewVisibilityChangedSignal(NDalicPINVOKE.VisibilityChangedSignal(View.getCPtr(view)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static FittingModeType FittingModeDefault - { - get - { - FittingModeType ret = (FittingModeType)NDalicPINVOKE.FittingModeDefault_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static SamplingModeType DEFAULT - { - get - { - SamplingModeType ret = (SamplingModeType)NDalicPINVOKE.DEFAULT_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static WindowFocusSignalType FocusChangedSignal(Window window) - { - WindowFocusSignalType ret = new WindowFocusSignalType(NDalicPINVOKE.FocusChangedSignal(Window.getCPtr(window)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static void SetAcceptFocus(Window window, bool accept) - { - NDalicPINVOKE.SetAcceptFocus(Window.getCPtr(window), accept); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static bool IsFocusAcceptable(Window window) - { - bool ret = NDalicPINVOKE.IsFocusAcceptable(Window.getCPtr(window)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static void Show(Window window) - { - NDalicPINVOKE.Show(Window.getCPtr(window)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static void Hide(Window window) - { - NDalicPINVOKE.Hide(Window.getCPtr(window)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static bool IsVisible(Window window) - { - bool ret = NDalicPINVOKE.IsVisible(Window.getCPtr(window)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public static ViewImpl GetImplementation(View handle) { ViewImpl ret = new ViewImpl(NDalicPINVOKE.GetImplementation__SWIG_0(View.getCPtr(handle)), false); @@ -1279,159 +868,101 @@ namespace Tizen.NUI return ret; } - public static KeyInputFocusSignal ResourceReadySignal(View control) - { - KeyInputFocusSignal ret = new KeyInputFocusSignal(NDalicPINVOKE.ResourceReadySignal(View.getCPtr(control)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static bool IsResourceReady(View control) - { - bool ret = NDalicPINVOKE.IsResourceReady(View.getCPtr(control)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - - public static SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t NewItemLayout(DefaultItemLayoutType type) + internal static SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t NewItemLayout(DefaultItemLayoutType type) { SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t ret = new SWIGTYPE_p_Dali__IntrusivePtrT_Dali__Toolkit__ItemLayout_t(NDalicPINVOKE.NewItemLayout((int)type), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public static void MoveActorConstraint(Vector3 current, SWIGTYPE_p_PropertyInputContainer inputs) - { - NDalicPINVOKE.MoveActorConstraint(Vector3.getCPtr(current), SWIGTYPE_p_PropertyInputContainer.getCPtr(inputs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static void WrapActorConstraint(Vector3 position, SWIGTYPE_p_PropertyInputContainer inputs) - { - NDalicPINVOKE.WrapActorConstraint(Vector3.getCPtr(position), SWIGTYPE_p_PropertyInputContainer.getCPtr(inputs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public static uint DEFAULT_RENDERING_BACKEND - { - get - { - uint ret = NDalicPINVOKE.DEFAULT_RENDERING_BACKEND_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - public static PixelData LoadImageSynchronously(string url) - { - PixelData ret = new PixelData(NDalicPINVOKE.LoadImageSynchronously__SWIG_0(url), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static PixelData LoadImageSynchronously(string url, Uint16Pair dimensions) - { - PixelData ret = new PixelData(NDalicPINVOKE.LoadImageSynchronously__SWIG_1(url, Uint16Pair.getCPtr(dimensions)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static PixelData LoadImageSynchronously(string url, Uint16Pair dimensions, FittingModeType fittingMode, SamplingModeType samplingMode, bool orientationCorrection) - { - PixelData ret = new PixelData(NDalicPINVOKE.LoadImageSynchronously__SWIG_2(url, Uint16Pair.getCPtr(dimensions), (int)fittingMode, (int)samplingMode, orientationCorrection), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public static void SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface arg1) + internal static void SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager keyboardFocusManager, CustomAlgorithmInterface arg1) { NDalicPINVOKE.SetCustomAlgorithm(SWIGTYPE_p_KeyboardFocusManager.getCPtr(keyboardFocusManager), CustomAlgorithmInterface.getCPtr(arg1)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static readonly int VISUAL_PROPERTY_TYPE = NDalicPINVOKE.VISUAL_PROPERTY_TYPE_get(); - public static readonly int VISUAL_PROPERTY_SHADER = NDalicPINVOKE.VISUAL_PROPERTY_SHADER_get(); - - public static readonly int VISUAL_SHADER_VERTEX = NDalicPINVOKE.VISUAL_SHADER_VERTEX_get(); - public static readonly int VISUAL_SHADER_FRAGMENT = NDalicPINVOKE.VISUAL_SHADER_FRAGMENT_get(); - public static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_X = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_X_get(); - public static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_Y = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_Y_get(); - public static readonly int VISUAL_SHADER_HINTS = NDalicPINVOKE.VISUAL_SHADER_HINTS_get(); - - public static readonly int BORDER_VISUAL_COLOR = NDalicPINVOKE.BORDER_VISUAL_COLOR_get(); - public static readonly int BORDER_VISUAL_SIZE = NDalicPINVOKE.BORDER_VISUAL_SIZE_get(); - public static readonly int BORDER_VISUAL_ANTI_ALIASING = NDalicPINVOKE.BORDER_VISUAL_ANTI_ALIASING_get(); - - public static readonly int COLOR_VISUAL_MIX_COLOR = NDalicPINVOKE.COLOR_VISUAL_MIX_COLOR_get(); - - public static readonly int GRADIENT_VISUAL_START_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_START_POSITION_get(); - public static readonly int GRADIENT_VISUAL_END_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_END_POSITION_get(); - public static readonly int GRADIENT_VISUAL_CENTER = NDalicPINVOKE.GRADIENT_VISUAL_CENTER_get(); - public static readonly int GRADIENT_VISUAL_RADIUS = NDalicPINVOKE.GRADIENT_VISUAL_RADIUS_get(); - public static readonly int GRADIENT_VISUAL_STOP_OFFSET = NDalicPINVOKE.GRADIENT_VISUAL_STOP_OFFSET_get(); - public static readonly int GRADIENT_VISUAL_STOP_COLOR = NDalicPINVOKE.GRADIENT_VISUAL_STOP_COLOR_get(); - public static readonly int GRADIENT_VISUAL_UNITS = NDalicPINVOKE.GRADIENT_VISUAL_UNITS_get(); - public static readonly int GRADIENT_VISUAL_SPREAD_METHOD = NDalicPINVOKE.GRADIENT_VISUAL_SPREAD_METHOD_get(); - - public static readonly int IMAGE_VISUAL_URL = NDalicPINVOKE.IMAGE_VISUAL_URL_get(); - public static readonly int IMAGE_VISUAL_FITTING_MODE = NDalicPINVOKE.IMAGE_VISUAL_FITTING_MODE_get(); - public static readonly int IMAGE_VISUAL_SAMPLING_MODE = NDalicPINVOKE.IMAGE_VISUAL_SAMPLING_MODE_get(); - public static readonly int IMAGE_VISUAL_DESIRED_WIDTH = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_WIDTH_get(); - public static readonly int IMAGE_VISUAL_DESIRED_HEIGHT = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_HEIGHT_get(); - public static readonly int IMAGE_VISUAL_SYNCHRONOUS_LOADING = NDalicPINVOKE.IMAGE_VISUAL_SYNCHRONOUS_LOADING_get(); - public static readonly int IMAGE_VISUAL_BORDER_ONLY = NDalicPINVOKE.IMAGE_VISUAL_BORDER_ONLY_get(); - public static readonly int IMAGE_VISUAL_PIXEL_AREA = NDalicPINVOKE.IMAGE_VISUAL_PIXEL_AREA_get(); - public static readonly int IMAGE_VISUAL_WRAP_MODE_U = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_U_get(); - public static readonly int IMAGE_VISUAL_WRAP_MODE_V = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_V_get(); - - public static readonly int MESH_VISUAL_OBJECT_URL = NDalicPINVOKE.MESH_VISUAL_OBJECT_URL_get(); - public static readonly int MESH_VISUAL_MATERIAL_URL = NDalicPINVOKE.MESH_VISUAL_MATERIAL_URL_get(); - public static readonly int MESH_VISUAL_TEXTURES_PATH = NDalicPINVOKE.MESH_VISUAL_TEXTURES_PATH_get(); - public static readonly int MESH_VISUAL_SHADING_MODE = NDalicPINVOKE.MESH_VISUAL_SHADING_MODE_get(); - public static readonly int MESH_VISUAL_USE_MIPMAPPING = NDalicPINVOKE.MESH_VISUAL_USE_MIPMAPPING_get(); - public static readonly int MESH_VISUAL_USE_SOFT_NORMALS = NDalicPINVOKE.MESH_VISUAL_USE_SOFT_NORMALS_get(); - public static readonly int MESH_VISUAL_LIGHT_POSITION = NDalicPINVOKE.MESH_VISUAL_LIGHT_POSITION_get(); - - public static readonly int PRIMITIVE_VISUAL_SHAPE = NDalicPINVOKE.PRIMITIVE_VISUAL_SHAPE_get(); - public static readonly int PRIMITIVE_VISUAL_MIX_COLOR = NDalicPINVOKE.PRIMITIVE_VISUAL_MIX_COLOR_get(); - public static readonly int PRIMITIVE_VISUAL_SLICES = NDalicPINVOKE.PRIMITIVE_VISUAL_SLICES_get(); - public static readonly int PRIMITIVE_VISUAL_STACKS = NDalicPINVOKE.PRIMITIVE_VISUAL_STACKS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_TOP_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_HEIGHT = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_HEIGHT_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_RADIUS_get(); - public static readonly int PRIMITIVE_VISUAL_SCALE_DIMENSIONS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_DIMENSIONS_get(); - public static readonly int PRIMITIVE_VISUAL_BEVEL_PERCENTAGE = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE_get(); - public static readonly int PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS_get(); - public static readonly int PRIMITIVE_VISUAL_LIGHT_POSITION = NDalicPINVOKE.PRIMITIVE_VISUAL_LIGHT_POSITION_get(); - - public static readonly int TEXT_VISUAL_TEXT = NDalicPINVOKE.TEXT_VISUAL_TEXT_get(); - public static readonly int TEXT_VISUAL_FONT_FAMILY = NDalicPINVOKE.TEXT_VISUAL_FONT_FAMILY_get(); - public static readonly int TEXT_VISUAL_FONT_STYLE = NDalicPINVOKE.TEXT_VISUAL_FONT_STYLE_get(); - public static readonly int TEXT_VISUAL_POINT_SIZE = NDalicPINVOKE.TEXT_VISUAL_POINT_SIZE_get(); - public static readonly int TEXT_VISUAL_MULTI_LINE = NDalicPINVOKE.TEXT_VISUAL_MULTI_LINE_get(); - public static readonly int TEXT_VISUAL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_HORIZONTAL_ALIGNMENT_get(); - public static readonly int TEXT_VISUAL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_VERTICAL_ALIGNMENT_get(); - public static readonly int TEXT_VISUAL_TEXT_COLOR = NDalicPINVOKE.TEXT_VISUAL_TEXT_COLOR_get(); - public static readonly int TEXT_VISUAL_ENABLE_MARKUP = NDalicPINVOKE.TEXT_VISUAL_ENABLE_MARKUP_get(); - - public static readonly int TOOLTIP_CONTENT = NDalicPINVOKE.TOOLTIP_CONTENT_get(); - public static readonly int TOOLTIP_LAYOUT = NDalicPINVOKE.TOOLTIP_LAYOUT_get(); - public static readonly int TOOLTIP_WAIT_TIME = NDalicPINVOKE.TOOLTIP_WAIT_TIME_get(); - public static readonly int TOOLTIP_BACKGROUND = NDalicPINVOKE.TOOLTIP_BACKGROUND_get(); - public static readonly int TOOLTIP_TAIL = NDalicPINVOKE.TOOLTIP_TAIL_get(); - public static readonly int TOOLTIP_POSITION = NDalicPINVOKE.TOOLTIP_POSITION_get(); - public static readonly int TOOLTIP_HOVER_POINT_OFFSET = NDalicPINVOKE.TOOLTIP_HOVER_POINT_OFFSET_get(); - public static readonly int TOOLTIP_MOVEMENT_THRESHOLD = NDalicPINVOKE.TOOLTIP_MOVEMENT_THRESHOLD_get(); - public static readonly int TOOLTIP_DISAPPEAR_ON_MOVEMENT = NDalicPINVOKE.TOOLTIP_DISAPPEAR_ON_MOVEMENT_get(); - - public static readonly int TOOLTIP_BACKGROUND_VISUAL = NDalicPINVOKE.TOOLTIP_BACKGROUND_VISUAL_get(); - public static readonly int TOOLTIP_BACKGROUND_BORDER = NDalicPINVOKE.TOOLTIP_BACKGROUND_BORDER_get(); - - public static readonly int TOOLTIP_TAIL_VISIBILITY = NDalicPINVOKE.TOOLTIP_TAIL_VISIBILITY_get(); - public static readonly int TOOLTIP_TAIL_ABOVE_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_ABOVE_VISUAL_get(); - public static readonly int TOOLTIP_TAIL_BELOW_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_BELOW_VISUAL_get(); + internal static readonly int VISUAL_PROPERTY_TYPE = NDalicPINVOKE.VISUAL_PROPERTY_TYPE_get(); + internal static readonly int VISUAL_PROPERTY_SHADER = NDalicPINVOKE.VISUAL_PROPERTY_SHADER_get(); + + internal static readonly int VISUAL_SHADER_VERTEX = NDalicPINVOKE.VISUAL_SHADER_VERTEX_get(); + internal static readonly int VISUAL_SHADER_FRAGMENT = NDalicPINVOKE.VISUAL_SHADER_FRAGMENT_get(); + internal static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_X = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_X_get(); + internal static readonly int VISUAL_SHADER_SUBDIVIDE_GRID_Y = NDalicPINVOKE.VISUAL_SHADER_SUBDIVIDE_GRID_Y_get(); + internal static readonly int VISUAL_SHADER_HINTS = NDalicPINVOKE.VISUAL_SHADER_HINTS_get(); + + internal static readonly int BORDER_VISUAL_COLOR = NDalicPINVOKE.BORDER_VISUAL_COLOR_get(); + internal static readonly int BORDER_VISUAL_SIZE = NDalicPINVOKE.BORDER_VISUAL_SIZE_get(); + internal static readonly int BORDER_VISUAL_ANTI_ALIASING = NDalicPINVOKE.BORDER_VISUAL_ANTI_ALIASING_get(); + + internal static readonly int COLOR_VISUAL_MIX_COLOR = NDalicPINVOKE.COLOR_VISUAL_MIX_COLOR_get(); + + internal static readonly int GRADIENT_VISUAL_START_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_START_POSITION_get(); + internal static readonly int GRADIENT_VISUAL_END_POSITION = NDalicPINVOKE.GRADIENT_VISUAL_END_POSITION_get(); + internal static readonly int GRADIENT_VISUAL_CENTER = NDalicPINVOKE.GRADIENT_VISUAL_CENTER_get(); + internal static readonly int GRADIENT_VISUAL_RADIUS = NDalicPINVOKE.GRADIENT_VISUAL_RADIUS_get(); + internal static readonly int GRADIENT_VISUAL_STOP_OFFSET = NDalicPINVOKE.GRADIENT_VISUAL_STOP_OFFSET_get(); + internal static readonly int GRADIENT_VISUAL_STOP_COLOR = NDalicPINVOKE.GRADIENT_VISUAL_STOP_COLOR_get(); + internal static readonly int GRADIENT_VISUAL_UNITS = NDalicPINVOKE.GRADIENT_VISUAL_UNITS_get(); + internal static readonly int GRADIENT_VISUAL_SPREAD_METHOD = NDalicPINVOKE.GRADIENT_VISUAL_SPREAD_METHOD_get(); + + internal static readonly int IMAGE_VISUAL_URL = NDalicPINVOKE.IMAGE_VISUAL_URL_get(); + internal static readonly int IMAGE_VISUAL_FITTING_MODE = NDalicPINVOKE.IMAGE_VISUAL_FITTING_MODE_get(); + internal static readonly int IMAGE_VISUAL_SAMPLING_MODE = NDalicPINVOKE.IMAGE_VISUAL_SAMPLING_MODE_get(); + internal static readonly int IMAGE_VISUAL_DESIRED_WIDTH = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_WIDTH_get(); + internal static readonly int IMAGE_VISUAL_DESIRED_HEIGHT = NDalicPINVOKE.IMAGE_VISUAL_DESIRED_HEIGHT_get(); + internal static readonly int IMAGE_VISUAL_SYNCHRONOUS_LOADING = NDalicPINVOKE.IMAGE_VISUAL_SYNCHRONOUS_LOADING_get(); + internal static readonly int IMAGE_VISUAL_BORDER_ONLY = NDalicPINVOKE.IMAGE_VISUAL_BORDER_ONLY_get(); + internal static readonly int IMAGE_VISUAL_PIXEL_AREA = NDalicPINVOKE.IMAGE_VISUAL_PIXEL_AREA_get(); + internal static readonly int IMAGE_VISUAL_WRAP_MODE_U = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_U_get(); + internal static readonly int IMAGE_VISUAL_WRAP_MODE_V = NDalicPINVOKE.IMAGE_VISUAL_WRAP_MODE_V_get(); + + internal static readonly int MESH_VISUAL_OBJECT_URL = NDalicPINVOKE.MESH_VISUAL_OBJECT_URL_get(); + internal static readonly int MESH_VISUAL_MATERIAL_URL = NDalicPINVOKE.MESH_VISUAL_MATERIAL_URL_get(); + internal static readonly int MESH_VISUAL_TEXTURES_PATH = NDalicPINVOKE.MESH_VISUAL_TEXTURES_PATH_get(); + internal static readonly int MESH_VISUAL_SHADING_MODE = NDalicPINVOKE.MESH_VISUAL_SHADING_MODE_get(); + internal static readonly int MESH_VISUAL_USE_MIPMAPPING = NDalicPINVOKE.MESH_VISUAL_USE_MIPMAPPING_get(); + internal static readonly int MESH_VISUAL_USE_SOFT_NORMALS = NDalicPINVOKE.MESH_VISUAL_USE_SOFT_NORMALS_get(); + internal static readonly int MESH_VISUAL_LIGHT_POSITION = NDalicPINVOKE.MESH_VISUAL_LIGHT_POSITION_get(); + + internal static readonly int PRIMITIVE_VISUAL_SHAPE = NDalicPINVOKE.PRIMITIVE_VISUAL_SHAPE_get(); + internal static readonly int PRIMITIVE_VISUAL_MIX_COLOR = NDalicPINVOKE.PRIMITIVE_VISUAL_MIX_COLOR_get(); + internal static readonly int PRIMITIVE_VISUAL_SLICES = NDalicPINVOKE.PRIMITIVE_VISUAL_SLICES_get(); + internal static readonly int PRIMITIVE_VISUAL_STACKS = NDalicPINVOKE.PRIMITIVE_VISUAL_STACKS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_TOP_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_HEIGHT = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_HEIGHT_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_RADIUS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_RADIUS_get(); + internal static readonly int PRIMITIVE_VISUAL_SCALE_DIMENSIONS = NDalicPINVOKE.PRIMITIVE_VISUAL_SCALE_DIMENSIONS_get(); + internal static readonly int PRIMITIVE_VISUAL_BEVEL_PERCENTAGE = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE_get(); + internal static readonly int PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS = NDalicPINVOKE.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS_get(); + internal static readonly int PRIMITIVE_VISUAL_LIGHT_POSITION = NDalicPINVOKE.PRIMITIVE_VISUAL_LIGHT_POSITION_get(); + + internal static readonly int TEXT_VISUAL_TEXT = NDalicPINVOKE.TEXT_VISUAL_TEXT_get(); + internal static readonly int TEXT_VISUAL_FONT_FAMILY = NDalicPINVOKE.TEXT_VISUAL_FONT_FAMILY_get(); + internal static readonly int TEXT_VISUAL_FONT_STYLE = NDalicPINVOKE.TEXT_VISUAL_FONT_STYLE_get(); + internal static readonly int TEXT_VISUAL_POINT_SIZE = NDalicPINVOKE.TEXT_VISUAL_POINT_SIZE_get(); + internal static readonly int TEXT_VISUAL_MULTI_LINE = NDalicPINVOKE.TEXT_VISUAL_MULTI_LINE_get(); + internal static readonly int TEXT_VISUAL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_HORIZONTAL_ALIGNMENT_get(); + internal static readonly int TEXT_VISUAL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TEXT_VISUAL_VERTICAL_ALIGNMENT_get(); + internal static readonly int TEXT_VISUAL_TEXT_COLOR = NDalicPINVOKE.TEXT_VISUAL_TEXT_COLOR_get(); + internal static readonly int TEXT_VISUAL_ENABLE_MARKUP = NDalicPINVOKE.TEXT_VISUAL_ENABLE_MARKUP_get(); + + internal static readonly int TOOLTIP_CONTENT = NDalicPINVOKE.TOOLTIP_CONTENT_get(); + internal static readonly int TOOLTIP_LAYOUT = NDalicPINVOKE.TOOLTIP_LAYOUT_get(); + internal static readonly int TOOLTIP_WAIT_TIME = NDalicPINVOKE.TOOLTIP_WAIT_TIME_get(); + internal static readonly int TOOLTIP_BACKGROUND = NDalicPINVOKE.TOOLTIP_BACKGROUND_get(); + internal static readonly int TOOLTIP_TAIL = NDalicPINVOKE.TOOLTIP_TAIL_get(); + internal static readonly int TOOLTIP_POSITION = NDalicPINVOKE.TOOLTIP_POSITION_get(); + internal static readonly int TOOLTIP_HOVER_POINT_OFFSET = NDalicPINVOKE.TOOLTIP_HOVER_POINT_OFFSET_get(); + internal static readonly int TOOLTIP_MOVEMENT_THRESHOLD = NDalicPINVOKE.TOOLTIP_MOVEMENT_THRESHOLD_get(); + internal static readonly int TOOLTIP_DISAPPEAR_ON_MOVEMENT = NDalicPINVOKE.TOOLTIP_DISAPPEAR_ON_MOVEMENT_get(); + + internal static readonly int TOOLTIP_BACKGROUND_VISUAL = NDalicPINVOKE.TOOLTIP_BACKGROUND_VISUAL_get(); + internal static readonly int TOOLTIP_BACKGROUND_BORDER = NDalicPINVOKE.TOOLTIP_BACKGROUND_BORDER_get(); + + internal static readonly int TOOLTIP_TAIL_VISIBILITY = NDalicPINVOKE.TOOLTIP_TAIL_VISIBILITY_get(); + internal static readonly int TOOLTIP_TAIL_ABOVE_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_ABOVE_VISUAL_get(); + internal static readonly int TOOLTIP_TAIL_BELOW_VISUAL = NDalicPINVOKE.TOOLTIP_TAIL_BELOW_VISUAL_get(); } diff --git a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs index 46c5a6a..91c6eea 100755 --- a/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs +++ b/src/Tizen.NUI/src/internal/NDalicPINVOKE.cs @@ -1659,13 +1659,13 @@ class NDalicPINVOKE { public static extern int Property_Value_GetType(global::System.Runtime.InteropServices.HandleRef jarg1); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_1")] - public static extern bool Property_Value_Get__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, ref bool jarg2); + public static extern bool Property_Value_Get__SWIG_1(global::System.Runtime.InteropServices.HandleRef jarg1, out bool jarg2); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_2")] - public static extern bool Property_Value_Get__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, ref float jarg2); + public static extern bool Property_Value_Get__SWIG_2(global::System.Runtime.InteropServices.HandleRef jarg1, out float jarg2); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_3")] - public static extern bool Property_Value_Get__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, ref int jarg2); + public static extern bool Property_Value_Get__SWIG_3(global::System.Runtime.InteropServices.HandleRef jarg1, out int jarg2); [global::System.Runtime.InteropServices.DllImport("libdali-csharp-binder.so", EntryPoint="CSharp_Dali_Property_Value_Get__SWIG_4")] public static extern bool Property_Value_Get__SWIG_4(global::System.Runtime.InteropServices.HandleRef jarg1, global::System.Runtime.InteropServices.HandleRef jarg2); diff --git a/src/Tizen.NUI/src/internal/PageTurnView.cs b/src/Tizen.NUI/src/internal/PageTurnView.cs index 2526115..a7867e0 100755 --- a/src/Tizen.NUI/src/internal/PageTurnView.cs +++ b/src/Tizen.NUI/src/internal/PageTurnView.cs @@ -556,11 +556,6 @@ namespace Tizen.NUI return ret; } - public enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } public Vector2 PageSize { @@ -580,7 +575,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(PageTurnView.Property.CURRENT_PAGE_ID).Get(ref temp); + GetProperty(PageTurnView.Property.CURRENT_PAGE_ID).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/PanGestureDetector.cs b/src/Tizen.NUI/src/internal/PanGestureDetector.cs index aa8d049..0b0857d 100755 --- a/src/Tizen.NUI/src/internal/PanGestureDetector.cs +++ b/src/Tizen.NUI/src/internal/PanGestureDetector.cs @@ -524,7 +524,7 @@ namespace Tizen.NUI get { bool temp = false; - Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.PANNING).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, PanGestureDetector.Property.PANNING).Get(out temp); return temp; } } diff --git a/src/Tizen.NUI/src/internal/PixelData.cs b/src/Tizen.NUI/src/internal/PixelData.cs index 3c332a6..3f373ca 100755 --- a/src/Tizen.NUI/src/internal/PixelData.cs +++ b/src/Tizen.NUI/src/internal/PixelData.cs @@ -81,17 +81,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PixelData(PixelData handle) : this(NDalicPINVOKE.new_PixelData__SWIG_1(PixelData.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public PixelData Assign(PixelData rhs) - { - PixelData ret = new PixelData(NDalicPINVOKE.PixelData_Assign(swigCPtr, PixelData.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public uint GetWidth() { diff --git a/src/Tizen.NUI/src/internal/RenderTask.cs b/src/Tizen.NUI/src/internal/RenderTask.cs index 9891a6a..1ffc324 100755 --- a/src/Tizen.NUI/src/internal/RenderTask.cs +++ b/src/Tizen.NUI/src/internal/RenderTask.cs @@ -160,7 +160,7 @@ namespace Tizen.NUI } - public static SWIGTYPE_p_f_r_Dali__Vector2__bool DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION + internal static SWIGTYPE_p_f_r_Dali__Vector2__bool DEFAULT_SCREEN_TO_FRAMEBUFFER_FUNCTION { get { @@ -171,7 +171,7 @@ namespace Tizen.NUI } } - public static SWIGTYPE_p_f_r_Dali__Vector2__bool FULLSCREEN_FRAMEBUFFER_FUNCTION + internal static SWIGTYPE_p_f_r_Dali__Vector2__bool FULLSCREEN_FRAMEBUFFER_FUNCTION { get { @@ -306,13 +306,13 @@ namespace Tizen.NUI return ret; } - public void SetCamera(Camera camera) + internal void SetCamera(Camera camera) { NDalicPINVOKE.RenderTask_SetCameraActor(swigCPtr, Camera.getCPtr(camera)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Camera GetCamera() + internal Camera GetCamera() { Camera ret = new Camera(NDalicPINVOKE.RenderTask_GetCameraActor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -345,13 +345,13 @@ namespace Tizen.NUI return ret; } - public void SetScreenToFrameBufferFunction(SWIGTYPE_p_f_r_Dali__Vector2__bool conversionFunction) + internal void SetScreenToFrameBufferFunction(SWIGTYPE_p_f_r_Dali__Vector2__bool conversionFunction) { NDalicPINVOKE.RenderTask_SetScreenToFrameBufferFunction(swigCPtr, SWIGTYPE_p_f_r_Dali__Vector2__bool.getCPtr(conversionFunction)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_f_r_Dali__Vector2__bool GetScreenToFrameBufferFunction() + internal SWIGTYPE_p_f_r_Dali__Vector2__bool GetScreenToFrameBufferFunction() { global::System.IntPtr cPtr = NDalicPINVOKE.RenderTask_GetScreenToFrameBufferFunction(swigCPtr); SWIGTYPE_p_f_r_Dali__Vector2__bool ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_f_r_Dali__Vector2__bool(cPtr, false); @@ -477,7 +477,7 @@ namespace Tizen.NUI return ret; } - public RenderTaskSignal FinishedSignal() + internal RenderTaskSignal FinishedSignal() { RenderTaskSignal ret = new RenderTaskSignal(NDalicPINVOKE.RenderTask_FinishedSignal(swigCPtr), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -534,7 +534,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(RenderTask.Property.REQUIRES_SYNC).Get(ref temp); + GetProperty(RenderTask.Property.REQUIRES_SYNC).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/Renderer.cs b/src/Tizen.NUI/src/internal/Renderer.cs index 5d84d99..0ea27a9 100755 --- a/src/Tizen.NUI/src/internal/Renderer.cs +++ b/src/Tizen.NUI/src/internal/Renderer.cs @@ -262,7 +262,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_INDEX).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_INDEX).Get(out temp); return temp; } set @@ -275,7 +275,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.FACE_CULLING_MODE).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.FACE_CULLING_MODE).Get(out temp); return temp; } set @@ -288,7 +288,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_MODE).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_MODE).Get(out temp); return temp; } set @@ -301,7 +301,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_RGB).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_RGB).Get(out temp); return temp; } set @@ -314,7 +314,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_EQUATION_ALPHA).Get(out temp); return temp; } set @@ -327,7 +327,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_RGB).Get(out temp); return temp; } set @@ -340,7 +340,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_RGB).Get(out temp); return temp; } set @@ -353,7 +353,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_SRC_ALPHA).Get(out temp); return temp; } set @@ -366,7 +366,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_FACTOR_DEST_ALPHA).Get(out temp); return temp; } set @@ -392,7 +392,7 @@ namespace Tizen.NUI get { bool temp = false; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.BLEND_PRE_MULTIPLIED_ALPHA).Get(out temp); return temp; } set @@ -405,7 +405,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_FIRST).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_FIRST).Get(out temp); return temp; } set @@ -418,7 +418,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_COUNT).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.INDEX_RANGE_COUNT).Get(out temp); return temp; } set @@ -431,7 +431,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_WRITE_MODE).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_WRITE_MODE).Get(out temp); return temp; } set @@ -444,7 +444,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_FUNCTION).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_FUNCTION).Get(out temp); return temp; } set @@ -457,7 +457,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_TEST_MODE).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.DEPTH_TEST_MODE).Get(out temp); return temp; } set @@ -470,7 +470,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.RENDER_MODE).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.RENDER_MODE).Get(out temp); return temp; } set @@ -483,7 +483,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION).Get(out temp); return temp; } set @@ -496,7 +496,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_MASK).Get(out temp); return temp; } set @@ -509,7 +509,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_FUNCTION_REFERENCE).Get(out temp); return temp; } set @@ -522,7 +522,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_MASK).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_MASK).Get(out temp); return temp; } set @@ -535,7 +535,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_FAIL).Get(out temp); return temp; } set @@ -548,7 +548,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_FAIL).Get(out temp); return temp; } set @@ -561,7 +561,7 @@ namespace Tizen.NUI get { int temp = 0; - Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get(ref temp); + Tizen.NUI.Object.GetProperty(swigCPtr, Renderer.Property.STENCIL_OPERATION_ON_Z_PASS).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/Slider.cs b/src/Tizen.NUI/src/internal/Slider.cs index 5ab6157..a6abd07 100755 --- a/src/Tizen.NUI/src/internal/Slider.cs +++ b/src/Tizen.NUI/src/internal/Slider.cs @@ -72,7 +72,7 @@ namespace Tizen.NUI.UIComponents //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -515,12 +515,6 @@ namespace Tizen.NUI.UIComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - /// /// Lower bound property /// @@ -529,7 +523,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Slider.Property.LOWER_BOUND).Get(ref temp); + GetProperty(Slider.Property.LOWER_BOUND).Get(out temp); return temp; } set @@ -546,7 +540,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Slider.Property.UPPER_BOUND).Get(ref temp); + GetProperty(Slider.Property.UPPER_BOUND).Get(out temp); return temp; } set @@ -563,7 +557,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Slider.Property.VALUE).Get(ref temp); + GetProperty(Slider.Property.VALUE).Get(out temp); return temp; } set @@ -682,7 +676,7 @@ namespace Tizen.NUI.UIComponents get { int temp = 0; - GetProperty(Slider.Property.VALUE_PRECISION).Get(ref temp); + GetProperty(Slider.Property.VALUE_PRECISION).Get(out temp); return temp; } set @@ -699,7 +693,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Slider.Property.SHOW_POPUP).Get(ref temp); + GetProperty(Slider.Property.SHOW_POPUP).Get(out temp); return temp; } set @@ -716,7 +710,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Slider.Property.SHOW_VALUE).Get(ref temp); + GetProperty(Slider.Property.SHOW_VALUE).Get(out temp); return temp; } set @@ -750,7 +744,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Slider.Property.SNAP_TO_MARKS).Get(ref temp); + GetProperty(Slider.Property.SNAP_TO_MARKS).Get(out temp); return temp; } set @@ -767,7 +761,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Slider.Property.MARK_TOLERANCE).Get(ref temp); + GetProperty(Slider.Property.MARK_TOLERANCE).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/Texture.cs b/src/Tizen.NUI/src/internal/Texture.cs index c910d3c..11c1292 100755 --- a/src/Tizen.NUI/src/internal/Texture.cs +++ b/src/Tizen.NUI/src/internal/Texture.cs @@ -137,7 +137,7 @@ namespace Tizen.NUI return ret; } - public Texture(SWIGTYPE_p_Dali__Internal__Texture pointer) : this(NDalicPINVOKE.new_Texture__SWIG_2(SWIGTYPE_p_Dali__Internal__Texture.getCPtr(pointer)), true) + internal Texture(SWIGTYPE_p_Dali__Internal__Texture pointer) : this(NDalicPINVOKE.new_Texture__SWIG_2(SWIGTYPE_p_Dali__Internal__Texture.getCPtr(pointer)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/TimePeriod.cs b/src/Tizen.NUI/src/internal/TimePeriod.cs index 656ba73..d0dc62d 100755 --- a/src/Tizen.NUI/src/internal/TimePeriod.cs +++ b/src/Tizen.NUI/src/internal/TimePeriod.cs @@ -104,7 +104,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float delaySeconds + public float DelaySeconds { set { @@ -119,7 +119,7 @@ namespace Tizen.NUI } } - public float durationSeconds + public float DurationSeconds { set { diff --git a/src/Tizen.NUI/src/internal/TouchPoint.cs b/src/Tizen.NUI/src/internal/TouchPoint.cs index 5c2e871..a222bf6 100755 --- a/src/Tizen.NUI/src/internal/TouchPoint.cs +++ b/src/Tizen.NUI/src/internal/TouchPoint.cs @@ -95,17 +95,17 @@ namespace Tizen.NUI } - public TouchPoint(int id, TouchPoint.State state, float screenX, float screenY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_0(id, (int)state, screenX, screenY), true) + public TouchPoint(int id, TouchPoint.StateType state, float screenX, float screenY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_0(id, (int)state, screenX, screenY), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TouchPoint(int id, TouchPoint.State state, float screenX, float screenY, float localX, float localY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_1(id, (int)state, screenX, screenY, localX, localY), true) + public TouchPoint(int id, TouchPoint.StateType state, float screenX, float screenY, float localX, float localY) : this(NDalicPINVOKE.new_TouchPoint__SWIG_1(id, (int)state, screenX, screenY, localX, localY), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public int deviceId + public int DeviceId { set { @@ -120,7 +120,7 @@ namespace Tizen.NUI } } - public TouchPoint.State state + public TouchPoint.StateType State { set { @@ -129,13 +129,13 @@ namespace Tizen.NUI } get { - TouchPoint.State ret = (TouchPoint.State)NDalicPINVOKE.TouchPoint_state_get(swigCPtr); + TouchPoint.StateType ret = (TouchPoint.StateType)NDalicPINVOKE.TouchPoint_state_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } } - public View hitView + public View HitView { set { @@ -151,7 +151,7 @@ namespace Tizen.NUI } } - public Vector2 local + public Vector2 Local { set { @@ -167,7 +167,7 @@ namespace Tizen.NUI } } - public Vector2 screen + public Vector2 Screen { set { @@ -183,7 +183,7 @@ namespace Tizen.NUI } } - public enum State + public enum StateType { Started, Finished, diff --git a/src/Tizen.NUI/src/internal/TypeAction.cs b/src/Tizen.NUI/src/internal/TypeAction.cs index 0f94ec8..ae0964e 100755 --- a/src/Tizen.NUI/src/internal/TypeAction.cs +++ b/src/Tizen.NUI/src/internal/TypeAction.cs @@ -94,7 +94,7 @@ namespace Tizen.NUI } - public TypeAction(TypeRegistration registered, string name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool f) : this(NDalicPINVOKE.new_TypeAction(TypeRegistration.getCPtr(registered), name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.getCPtr(f)), true) + internal TypeAction(TypeRegistration registered, string name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool f) : this(NDalicPINVOKE.new_TypeAction(TypeRegistration.getCPtr(registered), name, SWIGTYPE_p_f_p_Dali__BaseObject_r_q_const__std__string_r_q_const__Dali__Property__Map__bool.getCPtr(f)), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/TypeRegistration.cs b/src/Tizen.NUI/src/internal/TypeRegistration.cs index 4ed17d9..35bdfdb 100755 --- a/src/Tizen.NUI/src/internal/TypeRegistration.cs +++ b/src/Tizen.NUI/src/internal/TypeRegistration.cs @@ -98,7 +98,7 @@ namespace Tizen.NUI return NDalicPINVOKE.new_TypeRegistration__SWIG_0(SWIGTYPE_p_std__type_info.getCPtr(registerType), SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip)); } - public TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f), true) + internal TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -109,7 +109,7 @@ namespace Tizen.NUI return NDalicPINVOKE.new_TypeRegistration__SWIG_1(SWIGTYPE_p_std__type_info.getCPtr(registerType), SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip), callCreateOnInit); } - public TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f, bool callCreateOnInit) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f, callCreateOnInit), true) + internal TypeRegistration(SWIGTYPE_p_std__type_info registerType, SWIGTYPE_p_std__type_info baseType, System.Delegate f, bool callCreateOnInit) : this(TypeRegistration.SwigConstructTypeRegistration(registerType, baseType, f, callCreateOnInit), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -120,7 +120,7 @@ namespace Tizen.NUI return NDalicPINVOKE.new_TypeRegistration__SWIG_2(name, SWIGTYPE_p_std__type_info.getCPtr(baseType), new System.Runtime.InteropServices.HandleRef(null, ip)); } - public TypeRegistration(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(name, baseType, f), true) + internal TypeRegistration(string name, SWIGTYPE_p_std__type_info baseType, System.Delegate f) : this(TypeRegistration.SwigConstructTypeRegistration(name, baseType, f), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/internal/TypeRegistry.cs b/src/Tizen.NUI/src/internal/TypeRegistry.cs index bf52f5d..e343b74 100755 --- a/src/Tizen.NUI/src/internal/TypeRegistry.cs +++ b/src/Tizen.NUI/src/internal/TypeRegistry.cs @@ -11,7 +11,7 @@ namespace Tizen.NUI { - public class TypeRegistry : BaseHandle + internal class TypeRegistry : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/src/Tizen.NUI/src/internal/Uint16Pair.cs b/src/Tizen.NUI/src/internal/Uint16Pair.cs index 21f550c..419a260 100755 --- a/src/Tizen.NUI/src/internal/Uint16Pair.cs +++ b/src/Tizen.NUI/src/internal/Uint16Pair.cs @@ -178,28 +178,28 @@ namespace Tizen.NUI return ret; } - public bool EqualTo(Uint16Pair rhs) + private bool EqualTo(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_EqualTo(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool NotEqualTo(Uint16Pair rhs) + private bool NotEqualTo(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_NotEqualTo(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool LessThan(Uint16Pair rhs) + private bool LessThan(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_LessThan(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool GreaterThan(Uint16Pair rhs) + private bool GreaterThan(Uint16Pair rhs) { bool ret = NDalicPINVOKE.Uint16Pair_GreaterThan(swigCPtr, Uint16Pair.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs b/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs index 2d23d18..7ddcd3f 100755 --- a/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs +++ b/src/Tizen.NUI/src/internal/VectorUnsignedChar.cs @@ -111,7 +111,7 @@ namespace Tizen.NUI return ret; } - public SWIGTYPE_p_unsigned_char Begin() + internal SWIGTYPE_p_unsigned_char Begin() { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_Begin(swigCPtr); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); @@ -119,7 +119,7 @@ namespace Tizen.NUI return ret; } - public SWIGTYPE_p_unsigned_char End() + internal SWIGTYPE_p_unsigned_char End() { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_End(swigCPtr); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); @@ -127,7 +127,7 @@ namespace Tizen.NUI return ret; } - public SWIGTYPE_p_unsigned_char ValueOfIndex(uint index) + internal SWIGTYPE_p_unsigned_char ValueOfIndex(uint index) { SWIGTYPE_p_unsigned_char ret = new SWIGTYPE_p_unsigned_char(NDalicPINVOKE.VectorUnsignedChar_ValueOfIndex__SWIG_0(swigCPtr, index), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -146,7 +146,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void Insert(byte[] at, SWIGTYPE_p_unsigned_char from, SWIGTYPE_p_unsigned_char to) + internal void Insert(byte[] at, SWIGTYPE_p_unsigned_char from, SWIGTYPE_p_unsigned_char to) { NDalicPINVOKE.VectorUnsignedChar_Insert__SWIG_1(swigCPtr, at, SWIGTYPE_p_unsigned_char.getCPtr(from), SWIGTYPE_p_unsigned_char.getCPtr(to)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -170,7 +170,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public SWIGTYPE_p_unsigned_char Erase(byte[] iterator) + internal SWIGTYPE_p_unsigned_char Erase(byte[] iterator) { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_Erase__SWIG_0(swigCPtr, iterator); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); @@ -178,7 +178,7 @@ namespace Tizen.NUI return ret; } - public SWIGTYPE_p_unsigned_char Erase(byte[] first, SWIGTYPE_p_unsigned_char last) + internal SWIGTYPE_p_unsigned_char Erase(byte[] first, SWIGTYPE_p_unsigned_char last) { global::System.IntPtr cPtr = NDalicPINVOKE.VectorUnsignedChar_Erase__SWIG_1(swigCPtr, first, SWIGTYPE_p_unsigned_char.getCPtr(last)); SWIGTYPE_p_unsigned_char ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_char(cPtr, false); diff --git a/src/Tizen.NUI/src/internal/ViewRegistry.cs b/src/Tizen.NUI/src/internal/ViewRegistry.cs index 9e7fa13..141c58d 100755 --- a/src/Tizen.NUI/src/internal/ViewRegistry.cs +++ b/src/Tizen.NUI/src/internal/ViewRegistry.cs @@ -74,7 +74,7 @@ namespace Tizen.NUI /// /// /// - public class ScriptableProperty : System.Attribute + internal class ScriptableProperty : System.Attribute { public enum ScriptableType { @@ -123,7 +123,7 @@ namespace Tizen.NUI /// /// /// - public sealed class ViewRegistry + internal sealed class ViewRegistry { /// /// ViewRegistry is a singleton @@ -446,7 +446,7 @@ namespace Tizen.NUI if (type.Equals(typeof(Int32))) { int value = 0; - ok = propValue.Get(ref value); + ok = propValue.Get(out value); if (ok) { propertyInfo.SetValue(view, value); @@ -455,7 +455,7 @@ namespace Tizen.NUI else if (type.Equals(typeof(bool))) { bool value = false; - ok = propValue.Get(ref value); + ok = propValue.Get(out value); if (ok) { propertyInfo.SetValue(view, value); @@ -464,7 +464,7 @@ namespace Tizen.NUI else if (type.Equals(typeof(float))) { float value = 0; - ok = propValue.Get(ref value); + ok = propValue.Get(out value); if (ok) { propertyInfo.SetValue(view, value); diff --git a/src/Tizen.NUI/src/internal/VisualType.cs b/src/Tizen.NUI/src/internal/VisualType.cs deleted file mode 100644 index 2c97737..0000000 --- a/src/Tizen.NUI/src/internal/VisualType.cs +++ /dev/null @@ -1,30 +0,0 @@ -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ -/* moved to VisualMaps.cs -namespace Tizen.NUI { - - internal enum VisualType { - BORDER, - COLOR, - GRADIENT, - IMAGE, - MESH, - PRIMITIVE, - WIREFRAME - - , - TEXT, - N_PATCH, - SVG, - ANIMATED_IMAGE -} - -} -*/ \ No newline at end of file diff --git a/src/Tizen.NUI/src/internal/VoidSignal.cs b/src/Tizen.NUI/src/internal/VoidSignal.cs index 6cf2c0c..dcf15e1 100755 --- a/src/Tizen.NUI/src/internal/VoidSignal.cs +++ b/src/Tizen.NUI/src/internal/VoidSignal.cs @@ -131,7 +131,7 @@ namespace Tizen.NUI } } - public void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1) + internal void Connect(ConnectionTrackerInterface connectionTracker, SWIGTYPE_p_Dali__FunctorDelegate arg1) { NDalicPINVOKE.VoidSignal_Connect__SWIG_4(swigCPtr, ConnectionTrackerInterface.getCPtr(connectionTracker), SWIGTYPE_p_Dali__FunctorDelegate.getCPtr(arg1)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs b/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs index ddde060..5e05865 100755 --- a/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs +++ b/src/Tizen.NUI/src/internal/dotnetcore/AddedException.cs @@ -1,18 +1,18 @@ -// Copyright (c) 2017 Samsung Electronics Co., Ltd. -// -// Licensed under the Apache License, Version 2.0 (the "License"); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://www.apache.org/licenses/LICENSE-2.0 -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an "AS IS" BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// -// +/** Copyright (c) 2017 Samsung Electronics Co., Ltd. +* +* Licensed under the Apache License, Version 2.0 (the "License"); +* you may not use this file except in compliance with the License. +* You may obtain a copy of the License at +* +* http://www.apache.org/licenses/LICENSE-2.0 +* +* Unless required by applicable law or agreed to in writing, software +* distributed under the License is distributed on an "AS IS" BASIS, +* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. +* See the License for the specific language governing permissions and +* limitations under the License. +* +*/ namespace System { diff --git a/src/Tizen.NUI/src/internal/uintp.cs b/src/Tizen.NUI/src/internal/uintp.cs index be1f220..e152f0f 100755 --- a/src/Tizen.NUI/src/internal/uintp.cs +++ b/src/Tizen.NUI/src/internal/uintp.cs @@ -112,7 +112,7 @@ namespace Tizen.NUI return ret; } - public SWIGTYPE_p_unsigned_int cast() + internal SWIGTYPE_p_unsigned_int cast() { global::System.IntPtr cPtr = NDalicPINVOKE.uintp_cast(swigCPtr); SWIGTYPE_p_unsigned_int ret = (cPtr == global::System.IntPtr.Zero) ? null : new SWIGTYPE_p_unsigned_int(cPtr, false); @@ -120,7 +120,7 @@ namespace Tizen.NUI return ret; } - public static uintp frompointer(SWIGTYPE_p_unsigned_int t) + internal static uintp frompointer(SWIGTYPE_p_unsigned_int t) { global::System.IntPtr cPtr = NDalicPINVOKE.uintp_frompointer(SWIGTYPE_p_unsigned_int.getCPtr(t)); uintp ret = (cPtr == global::System.IntPtr.Zero) ? null : new uintp(cPtr, false); diff --git a/src/Tizen.NUI/src/internal/ushortp.cs b/src/Tizen.NUI/src/internal/ushortp.cs index 48b60ac..0d074fa 100755 --- a/src/Tizen.NUI/src/internal/ushortp.cs +++ b/src/Tizen.NUI/src/internal/ushortp.cs @@ -119,7 +119,7 @@ namespace Tizen.NUI return ret; } - public static ushortp frompointer(SWIGTYPE_p_unsigned_short t) + internal static ushortp frompointer(SWIGTYPE_p_unsigned_short t) { global::System.IntPtr cPtr = NDalicPINVOKE.ushortp_frompointer(SWIGTYPE_p_unsigned_short.getCPtr(t)); ushortp ret = (cPtr == global::System.IntPtr.Zero) ? null : new ushortp(cPtr, false); diff --git a/src/Tizen.NUI/src/public/AlphaFunction.cs b/src/Tizen.NUI/src/public/AlphaFunction.cs index 347fe4e..dde903e 100755 --- a/src/Tizen.NUI/src/public/AlphaFunction.cs +++ b/src/Tizen.NUI/src/public/AlphaFunction.cs @@ -40,7 +40,7 @@ namespace Tizen.NUI return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) + //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) //A Flag to check who called Dispose(). (By User or DisposeQueue) private bool isDisposeQueued = false; @@ -268,9 +268,14 @@ namespace Tizen.NUI public enum Modes { /// + /// The user has used a built-in function. + /// + BuiltinFunction, + + /// /// The user has provided a custom function /// - CustomFunction = 1, + CustomFunction, /// /// The user has provided the control points of a bezier curve /// diff --git a/src/Tizen.NUI/src/public/Animatable.cs b/src/Tizen.NUI/src/public/Animatable.cs index d02e57d..578477f 100755 --- a/src/Tizen.NUI/src/public/Animatable.cs +++ b/src/Tizen.NUI/src/public/Animatable.cs @@ -69,19 +69,8 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Animatable(Animatable handle) : this(NDalicPINVOKE.new_Handle__SWIG_1(Animatable.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public bool Supports(Animatable.Capability capability) - { - bool ret = NDalicPINVOKE.Handle_Supports(swigCPtr, (int)capability); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public uint GetPropertyCount() + internal uint GetPropertyCount() { uint ret = NDalicPINVOKE.Handle_GetPropertyCount(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -116,13 +105,6 @@ namespace Tizen.NUI return ret; } - public bool IsPropertyAConstraintInput(int index) - { - bool ret = NDalicPINVOKE.Handle_IsPropertyAConstraintInput(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public PropertyType GetPropertyType(int index) { PropertyType ret = (PropertyType)NDalicPINVOKE.Handle_GetPropertyType(swigCPtr, index); @@ -175,19 +157,19 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemovePropertyNotifications() + internal void RemovePropertyNotifications() { NDalicPINVOKE.Handle_RemovePropertyNotifications(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveConstraints() + internal void RemoveConstraints() { NDalicPINVOKE.Handle_RemoveConstraints__SWIG_0(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveConstraints(uint tag) + internal void RemoveConstraints(uint tag) { NDalicPINVOKE.Handle_RemoveConstraints__SWIG_1(swigCPtr, tag); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs index 89f77c2..dc92c96 100644 --- a/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/CustomView.cs @@ -1,5 +1,5 @@ /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2017 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. diff --git a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs index f1da24c..95a31ca 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -143,7 +143,7 @@ namespace Tizen.NUI.BaseComponents //Release your own unmanaged resources here. //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. + //because the execution order of Finalizes is non-deterministic. if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -158,97 +158,12 @@ namespace Tizen.NUI.BaseComponents base.Dispose(type); } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ImageView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_ImageView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int RESOURCE_URL = NDalicPINVOKE.ImageView_Property_RESOURCE_URL_get(); internal static readonly int IMAGE = NDalicPINVOKE.ImageView_Property_IMAGE_get(); internal static readonly int PRE_MULTIPLIED_ALPHA = NDalicPINVOKE.ImageView_Property_PRE_MULTIPLIED_ALPHA_get(); internal static readonly int PIXEL_AREA = NDalicPINVOKE.ImageView_Property_PIXEL_AREA_get(); - } /// @@ -274,16 +189,7 @@ namespace Tizen.NUI.BaseComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal ImageView(ImageView imageView) : this(NDalicPINVOKE.new_ImageView__SWIG_1(ImageView.getCPtr(imageView)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal ImageView Assign(ImageView imageView) - { - ImageView ret = new ImageView(NDalicPINVOKE.ImageView_Assign(swigCPtr, ImageView.getCPtr(imageView)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } + /// /// Downcasts a handle to ImageView handle.
/// If handle points to a ImageView, the downcast produces valid handle.
@@ -291,7 +197,7 @@ namespace Tizen.NUI.BaseComponents /// /// Handle to an object /// Handle to a ImageView or an uninitialized handle - public new static ImageView DownCast(BaseHandle handle) + internal new static ImageView DownCast(BaseHandle handle) { ImageView ret = new ImageView(NDalicPINVOKE.ImageView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -312,14 +218,6 @@ namespace Tizen.NUI.BaseComponents NDalicPINVOKE.ImageView_SetImage__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - internal ViewResourceReadySignal ResourceReadySignal(View view) { ViewResourceReadySignal ret = new ViewResourceReadySignal(NDalicPINVOKE.ResourceReadySignal(View.getCPtr(view)), false); @@ -392,7 +290,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(ImageView.Property.PRE_MULTIPLIED_ALPHA).Get(ref temp); + GetProperty(ImageView.Property.PRE_MULTIPLIED_ALPHA).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 0b06475..f8d209e 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -68,7 +68,7 @@ namespace Tizen.NUI.BaseComponents //Release your own unmanaged resources here. //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. + //because the execution order of Finalizes is non-deterministic. if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -159,92 +159,8 @@ namespace Tizen.NUI.BaseComponents } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextEditor_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_TextEditor_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextEditor_Property_RENDERING_BACKEND_get(); internal static readonly int TEXT = NDalicPINVOKE.TextEditor_Property_TEXT_get(); internal static readonly int TEXT_COLOR = NDalicPINVOKE.TextEditor_Property_TEXT_COLOR_get(); @@ -294,92 +210,8 @@ namespace Tizen.NUI.BaseComponents } - internal class InputStyle : global::System.IDisposable + internal class InputStyle { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal InputStyle(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(InputStyle obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~InputStyle() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextEditor_InputStyle(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal InputStyle() : this(NDalicPINVOKE.new_TextEditor_InputStyle(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal enum Mask { None = 0x0000, @@ -393,7 +225,6 @@ namespace Tizen.NUI.BaseComponents Emboss = 0x0080, Outline = 0x0100 } - } /// @@ -409,19 +240,12 @@ namespace Tizen.NUI.BaseComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal TextEditor Assign(TextEditor handle) - { - TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_Assign(swigCPtr, TextEditor.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to TextEditor. /// /// Handle to an object /// Handle to a TextEditor or an empty handle - public new static TextEditor DownCast(BaseHandle handle) + internal new static TextEditor DownCast(BaseHandle handle) { TextEditor ret = new TextEditor(NDalicPINVOKE.TextEditor_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -442,29 +266,6 @@ namespace Tizen.NUI.BaseComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - - /// - /// Rendering backend property - /// - public int RenderingBackend - { - get - { - int temp = 0; - GetProperty(TextEditor.Property.RENDERING_BACKEND).Get(ref temp); - return temp; - } - set - { - SetProperty(TextEditor.Property.RENDERING_BACKEND, new Tizen.NUI.PropertyValue(value)); - } - } - /// /// Text property. /// @@ -541,7 +342,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.POINT_SIZE).Get(ref temp); + GetProperty(TextEditor.Property.POINT_SIZE).Get(out temp); return temp; } set @@ -615,7 +416,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.SCROLL_THRESHOLD).Get(ref temp); + GetProperty(TextEditor.Property.SCROLL_THRESHOLD).Get(out temp); return temp; } set @@ -632,7 +433,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.SCROLL_SPEED).Get(ref temp); + GetProperty(TextEditor.Property.SCROLL_SPEED).Get(out temp); return temp; } set @@ -683,7 +484,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextEditor.Property.ENABLE_CURSOR_BLINK).Get(ref temp); + GetProperty(TextEditor.Property.ENABLE_CURSOR_BLINK).Get(out temp); return temp; } set @@ -700,7 +501,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.CURSOR_BLINK_INTERVAL).Get(ref temp); + GetProperty(TextEditor.Property.CURSOR_BLINK_INTERVAL).Get(out temp); return temp; } set @@ -717,7 +518,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.CURSOR_BLINK_DURATION).Get(ref temp); + GetProperty(TextEditor.Property.CURSOR_BLINK_DURATION).Get(out temp); return temp; } set @@ -734,7 +535,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(TextEditor.Property.CURSOR_WIDTH).Get(ref temp); + GetProperty(TextEditor.Property.CURSOR_WIDTH).Get(out temp); return temp; } set @@ -921,7 +722,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextEditor.Property.ENABLE_MARKUP).Get(ref temp); + GetProperty(TextEditor.Property.ENABLE_MARKUP).Get(out temp); return temp; } set @@ -989,7 +790,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.INPUT_POINT_SIZE).Get(ref temp); + GetProperty(TextEditor.Property.INPUT_POINT_SIZE).Get(out temp); return temp; } set @@ -1006,7 +807,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.LINE_SPACING).Get(ref temp); + GetProperty(TextEditor.Property.LINE_SPACING).Get(out temp); return temp; } set @@ -1023,7 +824,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.INPUT_LINE_SPACING).Get(ref temp); + GetProperty(TextEditor.Property.INPUT_LINE_SPACING).Get(out temp); return temp; } set @@ -1176,7 +977,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextEditor.Property.SMOOTH_SCROLL).Get(ref temp); + GetProperty(TextEditor.Property.SMOOTH_SCROLL).Get(out temp); return temp; } set @@ -1193,7 +994,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.SMOOTH_SCROLL_DURATION).Get(ref temp); + GetProperty(TextEditor.Property.SMOOTH_SCROLL_DURATION).Get(out temp); return temp; } set @@ -1210,7 +1011,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextEditor.Property.ENABLE_SCROLL_BAR).Get(ref temp); + GetProperty(TextEditor.Property.ENABLE_SCROLL_BAR).Get(out temp); return temp; } set @@ -1227,7 +1028,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.SCROLL_BAR_SHOW_DURATION).Get(ref temp); + GetProperty(TextEditor.Property.SCROLL_BAR_SHOW_DURATION).Get(out temp); return temp; } set @@ -1244,7 +1045,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.SCROLL_BAR_FADE_DURATION).Get(ref temp); + GetProperty(TextEditor.Property.SCROLL_BAR_FADE_DURATION).Get(out temp); return temp; } set @@ -1261,7 +1062,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextEditor.Property.PIXEL_SIZE).Get(ref temp); + GetProperty(TextEditor.Property.PIXEL_SIZE).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs index cffe75a..db3c3e7 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -69,7 +69,7 @@ namespace Tizen.NUI.BaseComponents //Release your own unmanaged resources here. //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. + //because the execution order of Finalizes is non-deterministic. if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -227,92 +227,8 @@ namespace Tizen.NUI.BaseComponents } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextField_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_TextField_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextField_Property_RENDERING_BACKEND_get(); internal static readonly int TEXT = NDalicPINVOKE.TextField_Property_TEXT_get(); internal static readonly int PLACEHOLDER_TEXT = NDalicPINVOKE.TextField_Property_PLACEHOLDER_TEXT_get(); @@ -365,92 +281,8 @@ namespace Tizen.NUI.BaseComponents } - internal class InputStyle : global::System.IDisposable + internal class InputStyle { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal InputStyle(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(InputStyle obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~InputStyle() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextField_InputStyle(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal InputStyle() : this(NDalicPINVOKE.new_TextField_InputStyle(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal enum Mask { None = 0x0000, @@ -479,19 +311,12 @@ namespace Tizen.NUI.BaseComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal TextField Assign(TextField handle) - { - TextField ret = new TextField(NDalicPINVOKE.TextField_Assign(swigCPtr, TextField.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to TextField. /// /// Handle to an object /// Handle to a TextField or an empty handle - public new static TextField DownCast(BaseHandle handle) + internal new static TextField DownCast(BaseHandle handle) { TextField ret = new TextField(NDalicPINVOKE.TextField_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -519,12 +344,6 @@ namespace Tizen.NUI.BaseComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - internal enum ExceedPolicyType { ExceedPolicyOriginal, @@ -532,23 +351,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// RenderingBackend property. - /// - public int RenderingBackend - { - get - { - int temp = 0; - GetProperty(TextField.Property.RENDERING_BACKEND).Get(ref temp); - return temp; - } - set - { - SetProperty(TextField.Property.RENDERING_BACKEND, new Tizen.NUI.PropertyValue(value)); - } - } - - /// /// Text property. /// public string Text @@ -641,7 +443,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.POINT_SIZE).Get(ref temp); + GetProperty(TextField.Property.POINT_SIZE).Get(out temp); return temp; } set @@ -658,7 +460,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(TextField.Property.MAX_LENGTH).Get(ref temp); + GetProperty(TextField.Property.MAX_LENGTH).Get(out temp); return temp; } set @@ -675,7 +477,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(TextField.Property.EXCEED_POLICY).Get(ref temp); + GetProperty(TextField.Property.EXCEED_POLICY).Get(out temp); return temp; } set @@ -908,7 +710,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextField.Property.ENABLE_CURSOR_BLINK).Get(ref temp); + GetProperty(TextField.Property.ENABLE_CURSOR_BLINK).Get(out temp); return temp; } set @@ -925,7 +727,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.CURSOR_BLINK_INTERVAL).Get(ref temp); + GetProperty(TextField.Property.CURSOR_BLINK_INTERVAL).Get(out temp); return temp; } set @@ -942,7 +744,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.CURSOR_BLINK_DURATION).Get(ref temp); + GetProperty(TextField.Property.CURSOR_BLINK_DURATION).Get(out temp); return temp; } set @@ -959,7 +761,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(TextField.Property.CURSOR_WIDTH).Get(ref temp); + GetProperty(TextField.Property.CURSOR_WIDTH).Get(out temp); return temp; } set @@ -1010,7 +812,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.SCROLL_THRESHOLD).Get(ref temp); + GetProperty(TextField.Property.SCROLL_THRESHOLD).Get(out temp); return temp; } set @@ -1027,7 +829,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.SCROLL_SPEED).Get(ref temp); + GetProperty(TextField.Property.SCROLL_SPEED).Get(out temp); return temp; } set @@ -1214,7 +1016,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextField.Property.ENABLE_MARKUP).Get(ref temp); + GetProperty(TextField.Property.ENABLE_MARKUP).Get(out temp); return temp; } set @@ -1265,7 +1067,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.INPUT_POINT_SIZE).Get(ref temp); + GetProperty(TextField.Property.INPUT_POINT_SIZE).Get(out temp); return temp; } set @@ -1435,7 +1237,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextField.Property.PIXEL_SIZE).Get(ref temp); + GetProperty(TextField.Property.PIXEL_SIZE).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index e5511ca..0ebbfe1 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -66,7 +66,7 @@ namespace Tizen.NUI.BaseComponents //Release your own unmanaged resources here. //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. + //because the execution order of Finalizes is non-deterministic. if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -81,91 +81,8 @@ namespace Tizen.NUI.BaseComponents base.Dispose(type); } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TextLabel_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_TextLabel_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int RENDERING_BACKEND = NDalicPINVOKE.TextLabel_Property_RENDERING_BACKEND_get(); internal static readonly int TEXT = NDalicPINVOKE.TextLabel_Property_TEXT_get(); internal static readonly int FONT_FAMILY = NDalicPINVOKE.TextLabel_Property_FONT_FAMILY_get(); @@ -220,48 +137,18 @@ namespace Tizen.NUI.BaseComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal TextLabel Assign(TextLabel handle) - { - TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_Assign(swigCPtr, TextLabel.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Downcasts a handle to TextLabel. /// /// Handle to an object - public new static TextLabel DownCast(BaseHandle handle) + internal new static TextLabel DownCast(BaseHandle handle) { TextLabel ret = new TextLabel(NDalicPINVOKE.TextLabel_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - - /// - /// RenderingBackend property.
- /// The type of rendering e.g. bitmap-based. - /// - public int RenderingBackend - { - get - { - int temp = 0; - GetProperty(TextLabel.Property.RENDERING_BACKEND).Get(ref temp); - return temp; - } - set - { - SetProperty(TextLabel.Property.RENDERING_BACKEND, new Tizen.NUI.PropertyValue(value)); - } - } - /// /// Text property.
/// The text to display in UTF-8 format.
@@ -325,7 +212,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextLabel.Property.POINT_SIZE).Get(ref temp); + GetProperty(TextLabel.Property.POINT_SIZE).Get(out temp); return temp; } set @@ -343,7 +230,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextLabel.Property.MULTI_LINE).Get(ref temp); + GetProperty(TextLabel.Property.MULTI_LINE).Get(out temp); return temp; } set @@ -530,7 +417,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextLabel.Property.UNDERLINE_ENABLED).Get(ref temp); + GetProperty(TextLabel.Property.UNDERLINE_ENABLED).Get(out temp); return temp; } set @@ -566,7 +453,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextLabel.Property.UNDERLINE_HEIGHT).Get(ref temp); + GetProperty(TextLabel.Property.UNDERLINE_HEIGHT).Get(out temp); return temp; } set @@ -584,7 +471,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextLabel.Property.ENABLE_MARKUP).Get(ref temp); + GetProperty(TextLabel.Property.ENABLE_MARKUP).Get(out temp); return temp; } set @@ -602,7 +489,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextLabel.Property.ENABLE_AUTO_SCROLL).Get(ref temp); + GetProperty(TextLabel.Property.ENABLE_AUTO_SCROLL).Get(out temp); return temp; } set @@ -620,7 +507,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(TextLabel.Property.AUTO_SCROLL_SPEED).Get(ref temp); + GetProperty(TextLabel.Property.AUTO_SCROLL_SPEED).Get(out temp); return temp; } set @@ -638,7 +525,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get(ref temp); + GetProperty(TextLabel.Property.AUTO_SCROLL_LOOP_COUNT).Get(out temp); return temp; } set @@ -656,7 +543,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextLabel.Property.AUTO_SCROLL_GAP).Get(ref temp); + GetProperty(TextLabel.Property.AUTO_SCROLL_GAP).Get(out temp); return temp; } set @@ -674,7 +561,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextLabel.Property.LINE_SPACING).Get(ref temp); + GetProperty(TextLabel.Property.LINE_SPACING).Get(out temp); return temp; } set @@ -764,7 +651,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextLabel.Property.PIXEL_SIZE).Get(ref temp); + GetProperty(TextLabel.Property.PIXEL_SIZE).Get(out temp); return temp; } set @@ -782,7 +669,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(TextLabel.Property.ELLIPSIS).Get(ref temp); + GetProperty(TextLabel.Property.ELLIPSIS).Get(out temp); return temp; } set @@ -800,7 +687,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TextLabel.Property.AUTO_SCROLL_LOOP_DELAY).Get(ref temp); + GetProperty(TextLabel.Property.AUTO_SCROLL_LOOP_DELAY).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/BaseComponents/View.cs b/src/Tizen.NUI/src/public/BaseComponents/View.cs index 9ea3d8f..177a6d1 100755 --- a/src/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/src/Tizen.NUI/src/public/BaseComponents/View.cs @@ -59,8 +59,8 @@ namespace Tizen.NUI.BaseComponents //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. - ViewRegistry.UnregisterView(this); + //Unreference this from if a static instance refer to this. + ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -190,7 +190,7 @@ namespace Tizen.NUI.BaseComponents /// Event for KeyPressed signal which can be used to subscribe/unsubscribe the event handler provided by the user.
/// KeyPressed signal is emitted when key event is received.
/// - public event EventHandlerWithReturnType KeyEvent + public event EventHandlerWithReturnType Key { add { @@ -237,7 +237,7 @@ namespace Tizen.NUI.BaseComponents /// Event for OnRelayout signal which can be used to subscribe/unsubscribe the event handler.
/// OnRelayout signal is emitted after the size has been set on the view during relayout.
/// - public event EventHandler OnRelayoutEvent + public event EventHandler Relayout { add { @@ -447,7 +447,7 @@ namespace Tizen.NUI.BaseComponents /// Event for WheelMoved signal which can be used to subscribe/unsubscribe the event handler provided by the user.
/// WheelMoved signal is emitted when wheel event is received.
/// - public event EventHandlerWithReturnType WheelMoved + public event EventHandlerWithReturnType WheelRolled { add { @@ -496,7 +496,7 @@ namespace Tizen.NUI.BaseComponents /// Event for OnWindow signal which can be used to subscribe/unsubscribe the event handler.
/// OnWindow signal is emitted after the view has been connected to the Window.
/// - public event EventHandler OnWindowEvent + public event EventHandler AddedToWindow { add { @@ -539,7 +539,7 @@ namespace Tizen.NUI.BaseComponents /// Event for OffWindow signal which can be used to subscribe/unsubscribe the event handler.
/// OffWindow signal is emitted after the view has been disconnected from the Window.
/// - public event EventHandler OffWindowEvent + public event EventHandler RemovedFromWindow { add { @@ -689,87 +689,8 @@ namespace Tizen.NUI.BaseComponents return (IntPtr)swigCPtr; } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_View_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - internal static readonly int TOOLTIP = NDalicManualPINVOKE.View_Property_TOOLTIP_get(); internal static readonly int STATE = NDalicManualPINVOKE.View_Property_STATE_get(); internal static readonly int SUB_STATE = NDalicManualPINVOKE.View_Property_SUB_STATE_get(); @@ -777,16 +698,7 @@ namespace Tizen.NUI.BaseComponents internal static readonly int RIGHT_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_RIGHT_FOCUSABLE_ACTOR_ID_get(); internal static readonly int UP_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_UP_FOCUSABLE_ACTOR_ID_get(); internal static readonly int DOWN_FOCUSABLE_VIEW_ID = NDalicManualPINVOKE.View_Property_DOWN_FOCUSABLE_ACTOR_ID_get(); - - internal Property() : this(NDalicPINVOKE.new_View_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int STYLE_NAME = NDalicPINVOKE.View_Property_STYLE_NAME_get(); - internal static readonly int BACKGROUND_COLOR = NDalicPINVOKE.View_Property_BACKGROUND_COLOR_get(); - internal static readonly int BACKGROUND_IMAGE = NDalicPINVOKE.View_Property_BACKGROUND_IMAGE_get(); - internal static readonly int KEY_INPUT_FOCUS = NDalicPINVOKE.View_Property_KEY_INPUT_FOCUS_get(); internal static readonly int BACKGROUND = NDalicPINVOKE.View_Property_BACKGROUND_get(); internal static readonly int SIBLING_ORDER = NDalicManualPINVOKE.Actor_Property_SIBLING_ORDER_get(); internal static readonly int OPACITY = NDalicManualPINVOKE.Actor_Property_OPACITY_get(); @@ -820,11 +732,6 @@ namespace Tizen.NUI.BaseComponents internal static readonly int SCALE_Z = NDalicPINVOKE.Actor_Property_SCALE_Z_get(); internal static readonly int WORLD_SCALE = NDalicPINVOKE.Actor_Property_WORLD_SCALE_get(); internal static readonly int VISIBLE = NDalicPINVOKE.Actor_Property_VISIBLE_get(); - internal static readonly int COLOR = NDalicPINVOKE.Actor_Property_COLOR_get(); - internal static readonly int COLOR_RED = NDalicPINVOKE.Actor_Property_COLOR_RED_get(); - internal static readonly int COLOR_GREEN = NDalicPINVOKE.Actor_Property_COLOR_GREEN_get(); - internal static readonly int COLOR_BLUE = NDalicPINVOKE.Actor_Property_COLOR_BLUE_get(); - internal static readonly int COLOR_ALPHA = NDalicPINVOKE.Actor_Property_COLOR_ALPHA_get(); internal static readonly int WORLD_COLOR = NDalicPINVOKE.Actor_Property_WORLD_COLOR_get(); internal static readonly int WORLD_MATRIX = NDalicPINVOKE.Actor_Property_WORLD_MATRIX_get(); internal static readonly int NAME = NDalicPINVOKE.Actor_Property_NAME_get(); @@ -832,8 +739,6 @@ namespace Tizen.NUI.BaseComponents internal static readonly int LEAVE_REQUIRED = NDalicPINVOKE.Actor_Property_LEAVE_REQUIRED_get(); internal static readonly int INHERIT_ORIENTATION = NDalicPINVOKE.Actor_Property_INHERIT_ORIENTATION_get(); internal static readonly int INHERIT_SCALE = NDalicPINVOKE.Actor_Property_INHERIT_SCALE_get(); - internal static readonly int COLOR_MODE = NDalicPINVOKE.Actor_Property_COLOR_MODE_get(); - internal static readonly int POSITION_INHERITANCE = NDalicPINVOKE.Actor_Property_POSITION_INHERITANCE_get(); internal static readonly int DRAW_MODE = NDalicPINVOKE.Actor_Property_DRAW_MODE_get(); internal static readonly int SIZE_MODE_FACTOR = NDalicPINVOKE.Actor_Property_SIZE_MODE_FACTOR_get(); internal static readonly int WIDTH_RESIZE_POLICY = NDalicPINVOKE.Actor_Property_WIDTH_RESIZE_POLICY_get(); @@ -876,13 +781,6 @@ namespace Tizen.NUI.BaseComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal View Assign(View handle) - { - View ret = new View(NDalicPINVOKE.View_Assign(swigCPtr, View.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to View handle.
/// If handle points to a View, the downcast produces valid handle.
@@ -1091,7 +989,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.PropertyMap background = Background; int visualType = 0; - background.Find(Visual.Property.Type).Get(ref visualType); + background.Find(Visual.Property.Type).Get(out visualType); if (visualType == (int)Visual.Type.Color) { background.Find(ColorVisualProperty.MixColor).Get(backgroundColor); @@ -1116,7 +1014,7 @@ namespace Tizen.NUI.BaseComponents Tizen.NUI.PropertyMap background = Background; int visualType = 0; - background.Find(Visual.Property.Type).Get(ref visualType); + background.Find(Visual.Property.Type).Get(out visualType); if (visualType == (int)Visual.Type.Image) { background.Find(ImageVisualProperty.URL).Get(out backgroundImage); @@ -1130,20 +1028,6 @@ namespace Tizen.NUI.BaseComponents } } - internal bool KeyInputFocus - { - get - { - bool temp = false; - GetProperty(View.Property.KEY_INPUT_FOCUS).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.KEY_INPUT_FOCUS, new Tizen.NUI.PropertyValue(value)); - } - } - /// /// mutually exclusive with BACKGROUND_COLOR & BACKGROUND_IMAGE, type Map or string for URL. /// @@ -1169,7 +1053,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - if (GetProperty(View.Property.STATE).Get(ref temp) == false) + if (GetProperty(View.Property.STATE).Get(out temp) == false) { #if DEBUG_ON Tizen.Log.Error("NUI", "State get error!"); @@ -1290,7 +1174,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.LEFT_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1304,7 +1188,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.RIGHT_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1318,7 +1202,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.UP_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1332,7 +1216,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID).Get(ref temp); + GetProperty(View.Property.DOWN_FOCUSABLE_VIEW_ID).Get(out temp); return temp; } set @@ -1345,13 +1229,13 @@ namespace Tizen.NUI.BaseComponents /// Child Property of FlexContainer.
/// The proportion of the free space in the container the flex item will receive.
/// If all items in the container set this property, their sizes will be proportional to the specified flex factor.
- /// + /// public float Flex { get { float temp = 0.0f; - GetProperty(FlexContainer.ChildProperty.FLEX).Get(ref temp); + GetProperty(FlexContainer.ChildProperty.FLEX).Get(out temp); return temp; } set @@ -1363,13 +1247,13 @@ namespace Tizen.NUI.BaseComponents /// /// Child Property of FlexContainer.
/// The alignment of the flex item along the cross axis, which, if set, overides the default alignment for all items in the container.
- /// + /// public int AlignSelf { get { int temp = 0; - GetProperty(FlexContainer.ChildProperty.ALIGN_SELF).Get(ref temp); + GetProperty(FlexContainer.ChildProperty.ALIGN_SELF).Get(out temp); return temp; } set @@ -1381,7 +1265,7 @@ namespace Tizen.NUI.BaseComponents /// /// Child Property of FlexContainer.
/// The space around the flex item.
- /// + /// public Vector4 FlexMargin { get @@ -1421,7 +1305,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TableView.ChildProperty.ROW_SPAN).Get(ref temp); + GetProperty(TableView.ChildProperty.ROW_SPAN).Get(out temp); return temp; } set @@ -1438,7 +1322,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(TableView.ChildProperty.COLUMN_SPAN).Get(ref temp); + GetProperty(TableView.ChildProperty.COLUMN_SPAN).Get(out temp); return temp; } set @@ -1754,7 +1638,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.OPACITY).Get(ref temp); + GetProperty(View.Property.OPACITY).Get(out temp); return temp; } set @@ -1807,7 +1691,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.POSITION_USES_ANCHOR_POINT).Get(ref temp); + GetProperty(View.Property.POSITION_USES_ANCHOR_POINT).Get(out temp); return temp; } set @@ -1816,7 +1700,7 @@ namespace Tizen.NUI.BaseComponents } } - public bool StateFocusEnable + internal bool FocusState { get { @@ -1864,7 +1748,7 @@ namespace Tizen.NUI.BaseComponents get { int temp = 0; - GetProperty(View.Property.SIBLING_ORDER).Get(ref temp); + GetProperty(View.Property.SIBLING_ORDER).Get(out temp); return temp; } set @@ -1879,7 +1763,7 @@ namespace Tizen.NUI.BaseComponents /// /// Readonly. /// - public Vector3 NaturalSize + internal Vector3 NaturalSize { get { @@ -2025,13 +1909,6 @@ namespace Tizen.NUI.BaseComponents return ret; } - internal bool IsLayer() - { - bool ret = NDalicPINVOKE.Actor_IsLayer(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - internal Layer GetLayer() { Layer ret = new Layer(NDalicPINVOKE.Actor_GetLayer(swigCPtr), true); @@ -2524,21 +2401,6 @@ namespace Tizen.NUI.BaseComponents return ret; } - internal void SetSensitive(bool sensitive) - { - NDalicPINVOKE.Actor_SetSensitive(swigCPtr, sensitive); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsSensitive() - { - bool ret = NDalicPINVOKE.Actor_IsSensitive(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Converts screen coordinates into the view's coordinate system using the default camera. /// @@ -2557,21 +2419,6 @@ namespace Tizen.NUI.BaseComponents return ret; } - internal void SetLeaveRequired(bool required) - { - NDalicPINVOKE.Actor_SetLeaveRequired(swigCPtr, required); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool GetLeaveRequired() - { - bool ret = NDalicPINVOKE.Actor_GetLeaveRequired(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - internal void SetKeyboardFocusable(bool focusable) { NDalicPINVOKE.Actor_SetKeyboardFocusable(swigCPtr, focusable); @@ -2602,21 +2449,6 @@ namespace Tizen.NUI.BaseComponents return ret; } - internal void SetSizeScalePolicy(SizeScalePolicyType policy) - { - NDalicPINVOKE.Actor_SetSizeScalePolicy(swigCPtr, (int)policy); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal SizeScalePolicyType GetSizeScalePolicy() - { - SizeScalePolicyType ret = (SizeScalePolicyType)NDalicPINVOKE.Actor_GetSizeScalePolicy(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Sets the relative to parent size factor of the view.
/// This factor is only used when ResizePolicy is set to either: @@ -2848,7 +2680,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.PARENT_ORIGIN_X).Get(ref temp); + GetProperty(View.Property.PARENT_ORIGIN_X).Get(out temp); return temp; } set @@ -2862,7 +2694,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.PARENT_ORIGIN_Y).Get(ref temp); + GetProperty(View.Property.PARENT_ORIGIN_Y).Get(out temp); return temp; } set @@ -2876,7 +2708,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.PARENT_ORIGIN_Z).Get(ref temp); + GetProperty(View.Property.PARENT_ORIGIN_Z).Get(out temp); return temp; } set @@ -2893,7 +2725,7 @@ namespace Tizen.NUI.BaseComponents /// An view's orientation is the rotation from its default orientation, the rotation is centered around its anchor-point.
/// 
The View has been initialized.
/// - public Position AnchorPoint + public Position PivotPoint { get { @@ -2907,12 +2739,12 @@ namespace Tizen.NUI.BaseComponents } } - internal float AnchorPointX + internal float PivotPointX { get { float temp = 0.0f; - GetProperty(View.Property.ANCHOR_POINT_X).Get(ref temp); + GetProperty(View.Property.ANCHOR_POINT_X).Get(out temp); return temp; } set @@ -2921,12 +2753,12 @@ namespace Tizen.NUI.BaseComponents } } - internal float AnchorPointY + internal float PivotPointY { get { float temp = 0.0f; - GetProperty(View.Property.ANCHOR_POINT_Y).Get(ref temp); + GetProperty(View.Property.ANCHOR_POINT_Y).Get(out temp); return temp; } set @@ -2935,12 +2767,12 @@ namespace Tizen.NUI.BaseComponents } } - internal float AnchorPointZ + internal float PivotPointZ { get { float temp = 0.0f; - GetProperty(View.Property.ANCHOR_POINT_Z).Get(ref temp); + GetProperty(View.Property.ANCHOR_POINT_Z).Get(out temp); return temp; } set @@ -2976,7 +2808,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.SIZE_WIDTH).Get(ref temp); + GetProperty(View.Property.SIZE_WIDTH).Get(out temp); return temp; } set @@ -2993,7 +2825,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.SIZE_HEIGHT).Get(ref temp); + GetProperty(View.Property.SIZE_HEIGHT).Get(out temp); return temp; } set @@ -3003,23 +2835,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// Gets/Sets the size depth of an view. - /// - public float SizeDepth - { - get - { - float temp = 0.0f; - GetProperty(View.Property.SIZE_DEPTH).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.SIZE_DEPTH, new Tizen.NUI.PropertyValue(value)); - } - } - - /// /// Gets/Sets the position of the View.
/// By default, sets the position vector between the parent origin and anchor point(default).
/// If Position inheritance if disabled, sets the world position.
@@ -3046,7 +2861,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.POSITION_X).Get(ref temp); + GetProperty(View.Property.POSITION_X).Get(out temp); return temp; } set @@ -3063,7 +2878,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.POSITION_Y).Get(ref temp); + GetProperty(View.Property.POSITION_Y).Get(out temp); return temp; } set @@ -3080,7 +2895,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.POSITION_Z).Get(ref temp); + GetProperty(View.Property.POSITION_Z).Get(out temp); return temp; } set @@ -3107,7 +2922,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.WORLD_POSITION_X).Get(ref temp); + GetProperty(View.Property.WORLD_POSITION_X).Get(out temp); return temp; } } @@ -3117,7 +2932,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.WORLD_POSITION_Y).Get(ref temp); + GetProperty(View.Property.WORLD_POSITION_Y).Get(out temp); return temp; } } @@ -3127,7 +2942,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.WORLD_POSITION_Z).Get(ref temp); + GetProperty(View.Property.WORLD_POSITION_Z).Get(out temp); return temp; } } @@ -3189,7 +3004,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.SCALE_X).Get(ref temp); + GetProperty(View.Property.SCALE_X).Get(out temp); return temp; } set @@ -3206,7 +3021,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.SCALE_Y).Get(ref temp); + GetProperty(View.Property.SCALE_Y).Get(out temp); return temp; } set @@ -3223,7 +3038,7 @@ namespace Tizen.NUI.BaseComponents get { float temp = 0.0f; - GetProperty(View.Property.SCALE_Z).Get(ref temp); + GetProperty(View.Property.SCALE_Z).Get(out temp); return temp; } set @@ -3257,7 +3072,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.VISIBLE).Get(ref temp); + GetProperty(View.Property.VISIBLE).Get(out temp); return temp; }/* only get is required : removed set @@ -3267,74 +3082,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// Gets/Sets the view's mix color red. - /// - public float ColorRed - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_RED).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_RED, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the view's mix color green. - /// - public float ColorGreen - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_GREEN).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_GREEN, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the view's mix color blue - /// - public float ColorBlue - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_BLUE).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_BLUE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Gets/Sets the view's mix color alpha. - /// - public float ColorAlpha - { - get - { - float temp = 0.0f; - GetProperty(View.Property.COLOR_ALPHA).Get(ref temp); - return temp; - } - set - { - SetProperty(View.Property.COLOR_ALPHA, new Tizen.NUI.PropertyValue(value)); - } - } - - /// /// Gets the view's world color. /// public Vector4 WorldColor @@ -3382,7 +3129,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.SENSITIVE).Get(ref temp); + GetProperty(View.Property.SENSITIVE).Get(out temp); return temp; } set @@ -3399,7 +3146,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.LEAVE_REQUIRED).Get(ref temp); + GetProperty(View.Property.LEAVE_REQUIRED).Get(out temp); return temp; } set @@ -3416,7 +3163,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.INHERIT_ORIENTATION).Get(ref temp); + GetProperty(View.Property.INHERIT_ORIENTATION).Get(out temp); return temp; } set @@ -3433,7 +3180,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.INHERIT_SCALE).Get(ref temp); + GetProperty(View.Property.INHERIT_SCALE).Get(out temp); return temp; } set @@ -3443,56 +3190,6 @@ namespace Tizen.NUI.BaseComponents } /// - /// Gets/Sets the view's color mode.
- /// This specifies whether the View uses its own color, or inherits its parent color.
- /// The default is UseOwnMultiplyParentAlpha.
- /// - public ColorMode ColorMode - { - get - { - string temp; - if (GetProperty(View.Property.COLOR_MODE).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "ColorMode get error!"); -#endif - } - switch (temp) - { - case "USE_OWN_COLOR": - return ColorMode.UseOwnColor; - case "USE_PARENT_COLOR": - return ColorMode.UseParentColor; - case "USE_OWN_MULTIPLY_PARENT_COLOR": - return ColorMode.UseOwnMultiplyParentColor; - case "USE_OWN_MULTIPLY_PARENT_ALPHA": - return ColorMode.UseOwnMultiplyParentAlpha; - default: - return ColorMode.UseOwnMultiplyParentAlpha; - } - } - set - { - SetProperty(View.Property.COLOR_MODE, new Tizen.NUI.PropertyValue((int)value)); - } - } - - public string PositionInheritance - { - get - { - string temp; - GetProperty(View.Property.POSITION_INHERITANCE).Get(out temp); - return temp; - } - set - { - SetProperty(View.Property.POSITION_INHERITANCE, new Tizen.NUI.PropertyValue(value)); - } - } - - /// /// Gets/Sets the status of how the view and its children should be drawn.
/// Not all views are renderable, but DrawMode can be inherited from any view.
/// If an object is in a 3D layer, it will be depth-tested against other objects in the world i.e. it may be obscured if other objects are in front.
@@ -3697,7 +3394,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.WIDTH_FOR_HEIGHT).Get(ref temp); + GetProperty(View.Property.WIDTH_FOR_HEIGHT).Get(out temp); return temp; } set @@ -3714,7 +3411,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.HEIGHT_FOR_WIDTH).Get(ref temp); + GetProperty(View.Property.HEIGHT_FOR_WIDTH).Get(out temp); return temp; } set @@ -3784,7 +3481,7 @@ namespace Tizen.NUI.BaseComponents get { bool temp = false; - GetProperty(View.Property.INHERIT_POSITION).Get(ref temp); + GetProperty(View.Property.INHERIT_POSITION).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/BaseHandle.cs b/src/Tizen.NUI/src/public/BaseHandle.cs index 75afbf1..ce7dc6e 100755 --- a/src/Tizen.NUI/src/public/BaseHandle.cs +++ b/src/Tizen.NUI/src/public/BaseHandle.cs @@ -216,11 +216,6 @@ namespace Tizen.NUI } - internal BaseHandle(BaseObject handle) : this(NDalicPINVOKE.new_BaseHandle__SWIG_0(BaseObject.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public BaseHandle() : this(NDalicPINVOKE.new_BaseHandle__SWIG_1(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -231,12 +226,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public BaseHandle Assign(BaseHandle rhs) - { - BaseHandle ret = new BaseHandle(NDalicPINVOKE.BaseHandle_Assign(swigCPtr, BaseHandle.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public bool DoAction(string actionName, PropertyMap attributes) { @@ -259,12 +248,6 @@ namespace Tizen.NUI return ret; } - internal BaseObject GetBaseObject() - { - BaseObject ret = new BaseObject(NDalicPINVOKE.BaseHandle_GetBaseObject__SWIG_0(swigCPtr), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } public void Reset() { diff --git a/src/Tizen.NUI/src/public/Color.cs b/src/Tizen.NUI/src/public/Color.cs index 9fc712e..505feb6 100755 --- a/src/Tizen.NUI/src/public/Color.cs +++ b/src/Tizen.NUI/src/public/Color.cs @@ -40,7 +40,7 @@ namespace Tizen.NUI return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) + //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) //A Flag to check who called Dispose(). (By User or DisposeQueue) private bool isDisposeQueued = false; @@ -151,6 +151,11 @@ namespace Tizen.NUI return arg1.Multiply(arg2); } + public static Color operator*(Color arg1, float arg2) + { + return arg1.Multiply(arg2); + } + /// /// Division operator. /// @@ -162,6 +167,11 @@ namespace Tizen.NUI return arg1.Divide(arg2); } + public static Color operator/(Color arg1, float arg2) + { + return arg1.Divide(arg2); + } + /// /// Array subscript operator overload. /// @@ -247,6 +257,13 @@ namespace Tizen.NUI return ret; } + private Color Multiply(float rhs) + { + Color ret = new Color(NDalicPINVOKE.Vector4_Multiply__SWIG_1(swigCPtr, rhs), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + private Color MultiplyAssign(Color rhs) { Color ret = new Color(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_0(swigCPtr, Color.getCPtr(rhs)), false); @@ -268,6 +285,12 @@ namespace Tizen.NUI return ret; } + private Color Divide(float rhs) + { + Color ret = new Color(NDalicPINVOKE.Vector4_Divide__SWIG_1(swigCPtr, rhs), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } private Color DivideAssign(Color rhs) { diff --git a/src/Tizen.NUI/src/public/CustomView/Spin.cs b/src/Tizen.NUI/src/public/CustomView/Spin.cs index 2303baa..96f2d12 100755 --- a/src/Tizen.NUI/src/public/CustomView/Spin.cs +++ b/src/Tizen.NUI/src/public/CustomView/Spin.cs @@ -86,12 +86,16 @@ namespace Tizen.NUI // Create image visual for the arrow keys _arrowVisualPropertyIndex = RegisterProperty("ArrowImage", new PropertyValue(_arrowImage), Tizen.NUI.PropertyAccessMode.ReadWrite); - _arrowVisual = VisualFactory.Get().CreateVisual(_arrowImage, new Uint16Pair(150, 150)); + _arrowVisual = VisualFactory.Get().CreateVisual( + new PropertyMap().Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image)) + .Add(ImageVisualProperty.URL, new PropertyValue(_arrowImage)) + .Add(ImageVisualProperty.DesiredHeight, new PropertyValue(150)) + .Add(ImageVisualProperty.DesiredWidth, new PropertyValue(150))); RegisterVisual(_arrowVisualPropertyIndex, _arrowVisual); // Create a text field _textField = new TextField(); - _textField.AnchorPoint = Tizen.NUI.AnchorPoint.Center; + _textField.PivotPoint = Tizen.NUI.AnchorPoint.Center; _textField.WidthResizePolicy = ResizePolicyType.SizeRelativeToParent; _textField.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent; _textField.SizeModeFactor = new Vector3(1.0f, 0.45f, 1.0f); @@ -220,7 +224,7 @@ namespace Tizen.NUI _textField.Text = _currentValue.ToString(); } } - + /// /// Minimum Value of Spin Value. /// @@ -373,7 +377,11 @@ namespace Tizen.NUI set { _arrowImage = value; - _arrowVisual = VisualFactory.Get().CreateVisual(_arrowImage, new Uint16Pair(150, 150)); + _arrowVisual = VisualFactory.Get().CreateVisual( + new PropertyMap().Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image)) + .Add(ImageVisualProperty.URL, new PropertyValue(_arrowImage)) + .Add(ImageVisualProperty.DesiredHeight, new PropertyValue(150)) + .Add(ImageVisualProperty.DesiredWidth, new PropertyValue(150))); RegisterVisual(_arrowVisualPropertyIndex, _arrowVisual); } } diff --git a/src/Tizen.NUI/src/public/Degree.cs b/src/Tizen.NUI/src/public/Degree.cs index 6fc876e..fcebba7 100755 --- a/src/Tizen.NUI/src/public/Degree.cs +++ b/src/Tizen.NUI/src/public/Degree.cs @@ -121,7 +121,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float degree + public float Value { set { diff --git a/src/Tizen.NUI/src/public/FlexContainer.cs b/src/Tizen.NUI/src/public/FlexContainer.cs index d33f4a5..0e598d6 100755 --- a/src/Tizen.NUI/src/public/FlexContainer.cs +++ b/src/Tizen.NUI/src/public/FlexContainer.cs @@ -82,92 +82,8 @@ namespace Tizen.NUI } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_FlexContainer_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_FlexContainer_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int CONTENT_DIRECTION = NDalicPINVOKE.FlexContainer_Property_CONTENT_DIRECTION_get(); internal static readonly int FLEX_DIRECTION = NDalicPINVOKE.FlexContainer_Property_FLEX_DIRECTION_get(); internal static readonly int FLEX_WRAP = NDalicPINVOKE.FlexContainer_Property_FLEX_WRAP_get(); @@ -180,96 +96,11 @@ namespace Tizen.NUI /// /// Enumeration for the instance of child properties belonging to the FlexContainer class. /// - public class ChildProperty : global::System.IDisposable + public class ChildProperty { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~ChildProperty() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_FlexContainer_ChildProperty(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal ChildProperty() : this(NDalicPINVOKE.new_FlexContainer_ChildProperty(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int FLEX = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_get(); internal static readonly int ALIGN_SELF = NDalicPINVOKE.FlexContainer_ChildProperty_ALIGN_SELF_get(); internal static readonly int FLEX_MARGIN = NDalicPINVOKE.FlexContainer_ChildProperty_FLEX_MARGIN_get(); - } /// @@ -281,17 +112,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal FlexContainer(FlexContainer handle) : this(NDalicPINVOKE.new_FlexContainer__SWIG_1(FlexContainer.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal FlexContainer Assign(FlexContainer handle) - { - FlexContainer ret = new FlexContainer(NDalicPINVOKE.FlexContainer_Assign(swigCPtr, FlexContainer.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } internal new static FlexContainer DownCast(BaseHandle handle) { @@ -359,14 +179,6 @@ namespace Tizen.NUI Wrap } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX, - CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - /// /// The primary direction in which content is ordered /// @@ -375,7 +187,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(ref temp); + GetProperty(FlexContainer.Property.CONTENT_DIRECTION).Get(out temp); return (ContentDirectionType)temp; } set @@ -392,7 +204,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(ref temp); + GetProperty(FlexContainer.Property.FLEX_DIRECTION).Get(out temp); return (FlexDirectionType)temp; } set @@ -409,7 +221,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(FlexContainer.Property.FLEX_WRAP).Get(ref temp); + GetProperty(FlexContainer.Property.FLEX_WRAP).Get(out temp); return (WrapType)temp; } set @@ -426,7 +238,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(ref temp); + GetProperty(FlexContainer.Property.JUSTIFY_CONTENT).Get(out temp); return (Justification)temp; } set @@ -443,7 +255,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(ref temp); + GetProperty(FlexContainer.Property.ALIGN_ITEMS).Get(out temp); return (Alignment)temp; } set @@ -460,7 +272,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(ref temp); + GetProperty(FlexContainer.Property.ALIGN_CONTENT).Get(out temp); return (Alignment)temp; } set diff --git a/src/Tizen.NUI/src/public/FocusManager.cs b/src/Tizen.NUI/src/public/FocusManager.cs index bf28761..5f035ed 100755 --- a/src/Tizen.NUI/src/public/FocusManager.cs +++ b/src/Tizen.NUI/src/public/FocusManager.cs @@ -386,9 +386,9 @@ namespace Tizen.NUI private FocusedViewEnterKeyEventCallback _focusedViewEnterKeyEventCallback; /// - /// FocusedViewEnterKeyPressed will be triggered when the current focused view has the enter key pressed on it. + /// FocusedViewActivated will be triggered when the current focused view has the enter key pressed on it. /// - public event EventHandler FocusedViewEnterKeyPressed + public event EventHandler FocusedViewActivated { add { diff --git a/src/Tizen.NUI/src/public/Gesture.cs b/src/Tizen.NUI/src/public/Gesture.cs index de0e078..7a5c1a8 100755 --- a/src/Tizen.NUI/src/public/Gesture.cs +++ b/src/Tizen.NUI/src/public/Gesture.cs @@ -32,7 +32,7 @@ namespace Tizen.NUI return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) + //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) //A Flag to check who called Dispose(). (By User or DisposeQueue) private bool isDisposeQueued = false; @@ -140,18 +140,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Assignment operator. - /// - /// A reference to the copied handle - /// A reference to this - public Gesture Assign(Gesture rhs) - { - Gesture ret = new Gesture(NDalicPINVOKE.Gesture_Assign(swigCPtr, Gesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private Gesture.GestureType type { set diff --git a/src/Tizen.NUI/src/public/Hover.cs b/src/Tizen.NUI/src/public/Hover.cs index a6cb98e..dfd6d92 100755 --- a/src/Tizen.NUI/src/public/Hover.cs +++ b/src/Tizen.NUI/src/public/Hover.cs @@ -127,7 +127,7 @@ namespace Tizen.NUI { if (point < points.Count) { - return points[(int)point].deviceId; + return points[(int)point].DeviceId; } return -1; } @@ -141,7 +141,7 @@ namespace Tizen.NUI { if (point < points.Count) { - return (Tizen.NUI.PointStateType)(points[(int)point].state); + return (Tizen.NUI.PointStateType)(points[(int)point].State); } return PointStateType.Finished; } @@ -155,7 +155,7 @@ namespace Tizen.NUI { if (point < points.Count) { - return points[(int)point].hitView; + return points[(int)point].HitView; } else { @@ -175,7 +175,7 @@ namespace Tizen.NUI { if (point < points.Count) { - return points[(int)point].local; + return points[(int)point].Local; } return new Vector2(0.0f, 0.0f); } @@ -189,7 +189,7 @@ namespace Tizen.NUI { if (point < points.Count) { - return points[(int)point].screen; + return points[(int)point].Screen; } return new Vector2(0.0f, 0.0f); } @@ -206,7 +206,7 @@ namespace Tizen.NUI /// Constructor. /// /// The time the event occurred - public Hover(uint time) : this(NDalicPINVOKE.new_Hover__SWIG_1(time), true) + internal Hover(uint time) : this(NDalicPINVOKE.new_Hover__SWIG_1(time), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } diff --git a/src/Tizen.NUI/src/public/Key.cs b/src/Tizen.NUI/src/public/Key.cs index 8fa76a5..4c00e12 100755 --- a/src/Tizen.NUI/src/public/Key.cs +++ b/src/Tizen.NUI/src/public/Key.cs @@ -13,7 +13,7 @@ namespace Tizen.NUI /// /// The key structure is used to store a key press. - /// + /// public class Key : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -115,7 +115,7 @@ namespace Tizen.NUI /// /// Name given to the key pressed - /// + /// public string KeyPressedName { get @@ -136,7 +136,7 @@ namespace Tizen.NUI /// /// Keycode for the key pressed. - /// + /// public int KeyCode { get @@ -147,7 +147,7 @@ namespace Tizen.NUI /// /// Special keys like shift, alt and control which modify the next key pressed. - /// + /// public int KeyModifier { get @@ -158,7 +158,7 @@ namespace Tizen.NUI /// /// The time (in ms) that the key event occurred. - /// + /// public uint Time { get @@ -169,7 +169,7 @@ namespace Tizen.NUI /// /// State of the key event. - /// + /// public Key.StateType State { get @@ -191,7 +191,7 @@ namespace Tizen.NUI /// /// Default Constructor. - /// + /// public Key() : this(NDalicPINVOKE.new_Key__SWIG_0(), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -206,20 +206,11 @@ namespace Tizen.NUI /// The key modifier for special keys like shift and alt /// The time (in ms) that the key event occurred /// The state of the key event - public Key(string keyName, string keyString, int keyCode, int keyModifier, uint timeStamp, Key.StateType keyState) : this(NDalicPINVOKE.new_Key__SWIG_1(keyName, keyString, keyCode, keyModifier, timeStamp, (int)keyState), true) + internal Key(string keyName, string keyString, int keyCode, int keyModifier, uint timeStamp, Key.StateType keyState) : this(NDalicPINVOKE.new_Key__SWIG_1(keyName, keyString, keyCode, keyModifier, timeStamp, (int)keyState), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Key(Key rhs) : this(NDalicPINVOKE.new_Key__SWIG_2(Key.getCPtr(rhs)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Key Assign(Key rhs) { - Key ret = new Key(NDalicPINVOKE.Key_Assign(swigCPtr, Key.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Checks to see if Shift key modifier has been supplied. /// diff --git a/src/Tizen.NUI/src/public/KeyFrames.cs b/src/Tizen.NUI/src/public/KeyFrames.cs index 6bb331b..225157f 100755 --- a/src/Tizen.NUI/src/public/KeyFrames.cs +++ b/src/Tizen.NUI/src/public/KeyFrames.cs @@ -116,25 +116,13 @@ namespace Tizen.NUI /// /// Handle to an object /// Handle to a KeyFrames object or an uninitialized handle - public static KeyFrames DownCast(BaseHandle handle) + internal static KeyFrames DownCast(BaseHandle handle) { KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal KeyFrames(KeyFrames handle) : this(NDalicPINVOKE.new_KeyFrames__SWIG_1(KeyFrames.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal KeyFrames Assign(KeyFrames rhs) - { - KeyFrames ret = new KeyFrames(NDalicPINVOKE.KeyFrames_Assign(swigCPtr, KeyFrames.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Gets the type of the key frame. /// diff --git a/src/Tizen.NUI/src/public/Layer.cs b/src/Tizen.NUI/src/public/Layer.cs index e7de055..45c9c7a 100755 --- a/src/Tizen.NUI/src/public/Layer.cs +++ b/src/Tizen.NUI/src/public/Layer.cs @@ -13,21 +13,9 @@ * limitations under the License. * */ -// This File has been auto-generated by SWIG and then modified using DALi Ruby Scripts -//------------------------------------------------------------------------------ -// -// -// This file was automatically generated by SWIG (http://www.swig.org). -// Version 3.0.9 -// -// Do not make changes to this file unless you know what you are doing--modify -// the SWIG interface file instead. -//------------------------------------------------------------------------------ namespace Tizen.NUI { - using System; - using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; /// @@ -79,96 +67,11 @@ namespace Tizen.NUI } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Layer_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_Layer_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int CLIPPING_ENABLE = NDalicPINVOKE.Layer_Property_CLIPPING_ENABLE_get(); internal static readonly int CLIPPING_BOX = NDalicPINVOKE.Layer_Property_CLIPPING_BOX_get(); internal static readonly int BEHAVIOR = NDalicPINVOKE.Layer_Property_BEHAVIOR_get(); - } /// @@ -186,25 +89,13 @@ namespace Tizen.NUI /// /// Handle to an object /// Handle to a Layer or an uninitialized handle - public new static Layer DownCast(BaseHandle handle) + internal new static Layer DownCast(BaseHandle handle) { Layer ret = new Layer(NDalicPINVOKE.Layer_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Layer(Layer copy) : this(NDalicPINVOKE.new_Layer__SWIG_1(Layer.getCPtr(copy)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Layer Assign(Layer rhs) - { - Layer ret = new Layer(NDalicPINVOKE.Layer_Assign(swigCPtr, Layer.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Search through this layer's hierarchy for an view with the given unique ID. /// @@ -335,74 +226,19 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetBehavior(LayerBehavior behavior) + private void SetBehavior(LayerBehavior behavior) { NDalicPINVOKE.Layer_SetBehavior(swigCPtr, (int)behavior); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal LayerBehavior GetBehavior() + private LayerBehavior GetBehavior() { Layer.LayerBehavior ret = (Layer.LayerBehavior)NDalicPINVOKE.Layer_GetBehavior(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal void SetClipping(bool enabled) - { - NDalicPINVOKE.Layer_SetClipping(swigCPtr, enabled); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsClipping() - { - bool ret = NDalicPINVOKE.Layer_IsClipping(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetClippingBox(int x, int y, int width, int height) - { - NDalicPINVOKE.Layer_SetClippingBox__SWIG_0(swigCPtr, x, y, width, height); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Sets the clipping box of a layer, in window coordinates.
- /// The contents of the layer will not be visible outside this box, when clipping is - /// enabled. The default clipping box is empty (0,0,0,0) which means everything is clipped.
- /// - /// The clipping box - public void SetClippingBox(Rectangle box) - { - NDalicPINVOKE.Layer_SetClippingBox__SWIG_1(swigCPtr, Rectangle.getCPtr(box)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Retrieves the clipping box of a layer in window coordinates. - /// - /// The clipping box - public Rectangle GetClippingBox() - { - Rectangle ret = new Rectangle(NDalicPINVOKE.Layer_GetClippingBox(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetDepthTestDisabled(bool disable) - { - NDalicPINVOKE.Layer_SetDepthTestDisabled(swigCPtr, disable); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal bool IsDepthTestDisabled() - { - bool ret = NDalicPINVOKE.Layer_IsDepthTestDisabled(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - internal void SetSortFunction(SWIGTYPE_p_f_r_q_const__Dali__Vector3__float function) { NDalicPINVOKE.Layer_SetSortFunction(swigCPtr, SWIGTYPE_p_f_r_q_const__Dali__Vector3__float.getCPtr(function)); @@ -443,7 +279,7 @@ namespace Tizen.NUI /// The view for the given index or empty handle if children not initialized public View GetChildAt(uint index) { - IntPtr cPtr = NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index); + System.IntPtr cPtr = NDalicPINVOKE.Actor_GetChildAt(swigCPtr, index); cPtr = NDalicPINVOKE.View_SWIGUpcast(cPtr); cPtr = NDalicPINVOKE.Handle_SWIGUpcast(cPtr); @@ -473,38 +309,6 @@ namespace Tizen.NUI } /// - /// Layer ClippingEnable, type bool - /// - public bool ClippingEnable - { - get - { - bool temp = false; - GetProperty(Layer.Property.CLIPPING_ENABLE).Get(ref temp); - return temp; - } - set - { - SetProperty(Layer.Property.CLIPPING_ENABLE, new Tizen.NUI.PropertyValue(value)); - } - } - /// - /// Layer ClippingBox, type Rectangle - /// - public Rectangle ClippingBox - { - get - { - Rectangle temp = new Rectangle(0, 0, 0, 0); - GetProperty(Layer.Property.CLIPPING_BOX).Get(temp); - return temp; - } - set - { - SetProperty(Layer.Property.CLIPPING_BOX, new Tizen.NUI.PropertyValue(value)); - } - } - /// /// Layer Behavior, type String(Layer.LayerBehavior) /// public Layer.LayerBehavior Behavior @@ -519,49 +323,6 @@ namespace Tizen.NUI } } - /// - /// Gets/Sets the Layer's name. - /// - public string Name - { - get - { - return GetName(); - } - set - { - SetName(value); - } - } - - internal string GetName() - { - string ret = NDalicPINVOKE.Actor_GetName(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetName(string name) - { - NDalicPINVOKE.Actor_SetName(swigCPtr, name); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Retrieves the number of children held by the layer. - /// - /// 
The layer has been initialized.
- /// The number of children - public uint GetChildCount() - { - uint ret = NDalicPINVOKE.Actor_GetChildCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) - throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } } diff --git a/src/Tizen.NUI/src/public/LongPressGesture.cs b/src/Tizen.NUI/src/public/LongPressGesture.cs index c9009fb..319fc99 100755 --- a/src/Tizen.NUI/src/public/LongPressGesture.cs +++ b/src/Tizen.NUI/src/public/LongPressGesture.cs @@ -113,26 +113,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Copy constructor. - /// - /// A reference to the copied handle - public LongPressGesture(LongPressGesture rhs) : this(NDalicPINVOKE.new_LongPressGesture__SWIG_1(LongPressGesture.getCPtr(rhs)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Assignment operator. - /// - /// A reference to the copied handle - /// A reference to this - public LongPressGesture Assign(LongPressGesture rhs) - { - LongPressGesture ret = new LongPressGesture(NDalicPINVOKE.LongPressGesture_Assign(swigCPtr, LongPressGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } private uint numberOfTouches { diff --git a/src/Tizen.NUI/src/public/PaddingType.cs b/src/Tizen.NUI/src/public/PaddingType.cs index 86691f5..7c74815 100755 --- a/src/Tizen.NUI/src/public/PaddingType.cs +++ b/src/Tizen.NUI/src/public/PaddingType.cs @@ -182,18 +182,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public PaddingType(PaddingType rhs) : this(NDalicPINVOKE.new_PaddingType__SWIG_2(PaddingType.getCPtr(rhs)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public PaddingType Assign(PaddingType rhs) - { - PaddingType ret = new PaddingType(NDalicPINVOKE.PaddingType_Assign(swigCPtr, PaddingType.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public void Set(float newX, float newY, float newWidth, float newHeight) { NDalicPINVOKE.PaddingType_Set(swigCPtr, newX, newY, newWidth, newHeight); diff --git a/src/Tizen.NUI/src/public/PanGesture.cs b/src/Tizen.NUI/src/public/PanGesture.cs index 0011b09..0d33ac9 100755 --- a/src/Tizen.NUI/src/public/PanGesture.cs +++ b/src/Tizen.NUI/src/public/PanGesture.cs @@ -176,31 +176,11 @@ namespace Tizen.NUI /// Constructor. /// /// The state of the gesture - public PanGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PanGesture__SWIG_1((int)state), true) + internal PanGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PanGesture__SWIG_1((int)state), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Copy constructor. - /// - /// A reference to the copied handle - public PanGesture(PanGesture rhs) : this(NDalicPINVOKE.new_PanGesture__SWIG_2(PanGesture.getCPtr(rhs)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Assignment operator. - /// - /// A reference to the copied handle - /// A reference to this - public PanGesture Assign(PanGesture rhs) - { - PanGesture ret = new PanGesture(NDalicPINVOKE.PanGesture_Assign(swigCPtr, PanGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } private Vector2 velocity { diff --git a/src/Tizen.NUI/src/public/Path.cs b/src/Tizen.NUI/src/public/Path.cs index dde5453..307d07f 100755 --- a/src/Tizen.NUI/src/public/Path.cs +++ b/src/Tizen.NUI/src/public/Path.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI /// /// A 3D parametric curve.
/// Paths can be used to animate position and orientation of actors.
- /// + /// public class Path : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -77,95 +77,10 @@ namespace Tizen.NUI } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Path_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_Path_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int POINTS = NDalicPINVOKE.Path_Property_POINTS_get(); internal static readonly int CONTROL_POINTS = NDalicPINVOKE.Path_Property_CONTROL_POINTS_get(); - } /// @@ -176,30 +91,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Downcasts a handle to Path handle.
- /// If handle points to a Path object, the downcast produces valid handle.
- /// If not, the returned handle is left uninitialized.
- /// - /// Handle to an object - public new static Path DownCast(BaseHandle handle) - { - Path ret = new Path(NDalicPINVOKE.Path_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Path(Path handle) : this(NDalicPINVOKE.new_Path__SWIG_1(Path.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Path Assign(Path rhs) - { - Path ret = new Path(NDalicPINVOKE.Path_Assign(swigCPtr, Path.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Adds an interpolation point. @@ -262,7 +153,7 @@ namespace Tizen.NUI /// /// Accessor for the control points. /// - /// The index of the control point + /// The index of the control point public Vector3 GetControlPoint(uint index) { Vector3 ret = new Vector3(NDalicPINVOKE.Path_GetControlPoint(swigCPtr, index), false); diff --git a/src/Tizen.NUI/src/public/PinchGesture.cs b/src/Tizen.NUI/src/public/PinchGesture.cs index 6869eb0..d5a46cc 100755 --- a/src/Tizen.NUI/src/public/PinchGesture.cs +++ b/src/Tizen.NUI/src/public/PinchGesture.cs @@ -120,32 +120,11 @@ namespace Tizen.NUI /// Default Constructor. /// /// The state of the gesture - public PinchGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PinchGesture__SWIG_0((int)state), true) + internal PinchGesture(Gesture.StateType state) : this(NDalicPINVOKE.new_PinchGesture__SWIG_0((int)state), true) { if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Copy constructor. - /// - /// A reference to the copied handle - public PinchGesture(PinchGesture rhs) : this(NDalicPINVOKE.new_PinchGesture__SWIG_1(PinchGesture.getCPtr(rhs)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Assignment operator. - /// - /// A reference to the copied handle - /// A reference to this - public PinchGesture Assign(PinchGesture rhs) - { - PinchGesture ret = new PinchGesture(NDalicPINVOKE.PinchGesture_Assign(swigCPtr, PinchGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - private float scale { set diff --git a/src/Tizen.NUI/src/public/ProgressBar.cs b/src/Tizen.NUI/src/public/ProgressBar.cs index e284c04..6085d40 100755 --- a/src/Tizen.NUI/src/public/ProgressBar.cs +++ b/src/Tizen.NUI/src/public/ProgressBar.cs @@ -72,7 +72,7 @@ namespace Tizen.NUI.UIComponents //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -190,94 +190,8 @@ namespace Tizen.NUI.UIComponents return ret; } - - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ProgressBar_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_ProgressBar_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_PROGRESS_VALUE_get(); internal static readonly int SECONDARY_PROGRESS_VALUE = NDalicPINVOKE.ProgressBar_Property_SECONDARY_PROGRESS_VALUE_get(); internal static readonly int INDETERMINATE = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_get(); @@ -287,7 +201,6 @@ namespace Tizen.NUI.UIComponents internal static readonly int INDETERMINATE_VISUAL = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_get(); internal static readonly int INDETERMINATE_VISUAL_ANIMATION = NDalicPINVOKE.ProgressBar_Property_INDETERMINATE_VISUAL_ANIMATION_get(); internal static readonly int LABEL_VISUAL = NDalicPINVOKE.ProgressBar_Property_LABEL_VISUAL_get(); - } /// @@ -298,31 +211,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal ProgressBar(ProgressBar handle) : this(NDalicPINVOKE.new_ProgressBar__SWIG_1(ProgressBar.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal ProgressBar Assign(ProgressBar handle) - { - ProgressBar ret = new ProgressBar(NDalicPINVOKE.ProgressBar_Assign(swigCPtr, ProgressBar.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Downcasts a handle to ProgressBar handle.
- /// If handle points to a ProgressBar, the downcast produces valid handle.
- /// If not the returned handle is left uninitialized.
- /// - /// Handle to an object - /// handle to a ProgressBar or an uninitialized handle - public new static ProgressBar DownCast(BaseHandle handle) - { - ProgressBar ret = new ProgressBar(NDalicPINVOKE.ProgressBar_DownCast(BaseHandle.getCPtr(handle)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } internal ProgressBarValueChangedSignal ValueChangedSignal() { @@ -331,12 +219,6 @@ namespace Tizen.NUI.UIComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - /// /// The progress value of progress bar, progress runs form 0 to 1.
/// If Value is set to 0, progress bar will be set to beginning.
@@ -348,7 +230,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ProgressBar.Property.PROGRESS_VALUE).Get(ref temp); + GetProperty(ProgressBar.Property.PROGRESS_VALUE).Get(out temp); return temp; } set @@ -368,7 +250,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get(ref temp); + GetProperty(ProgressBar.Property.SECONDARY_PROGRESS_VALUE).Get(out temp); return temp; } set @@ -384,7 +266,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(ProgressBar.Property.INDETERMINATE).Get(ref temp); + GetProperty(ProgressBar.Property.INDETERMINATE).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs index 2b4f133..71879cf 100755 --- a/src/Tizen.NUI/src/public/Property.cs +++ b/src/Tizen.NUI/src/public/Property.cs @@ -441,25 +441,12 @@ namespace Tizen.NUI /// /// The element index to retrieve. /// The a reference to the element - public PropertyValue ValueOfIndex(uint index) + private PropertyValue ValueOfIndex(uint index) { PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Array_ValueOfIndex__SWIG_0(swigCPtr, index), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - /// - /// Copy the array. - /// - /// The array to copy from - /// The copied array - internal PropertyArray Assign(PropertyArray other) - { - PropertyArray ret = new PropertyArray(NDalicPINVOKE.Property_Array_Assign(swigCPtr, PropertyArray.getCPtr(other)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } /// @@ -481,7 +468,7 @@ namespace Tizen.NUI return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; } - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) + //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) //A Flag to check who called Dispose(). (By User or DisposeQueue) private bool isDisposeQueued = false; @@ -549,7 +536,7 @@ namespace Tizen.NUI /// /// The type of the key /// - public PropertyKey.Type type + public PropertyKey.KeyType Type { set { @@ -558,7 +545,7 @@ namespace Tizen.NUI } get { - PropertyKey.Type ret = (PropertyKey.Type)NDalicPINVOKE.Property_Key_type_get(swigCPtr); + PropertyKey.KeyType ret = (PropertyKey.KeyType)NDalicPINVOKE.Property_Key_type_get(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -567,7 +554,7 @@ namespace Tizen.NUI /// /// The index key. /// - public int indexKey + public int IndexKey { set { @@ -585,7 +572,7 @@ namespace Tizen.NUI /// /// The string key. /// - public string stringKey + public string StringKey { set { @@ -693,7 +680,7 @@ namespace Tizen.NUI /// /// The type of key /// - public enum Type + public enum KeyType { Index, String @@ -917,18 +904,6 @@ namespace Tizen.NUI } /// - /// Retrieves the key at the specified position. - /// - /// The specified position - /// A reference to the key at the specified position - public string GetKey(uint position) - { - string ret = NDalicPINVOKE.Property_Map_GetKey(swigCPtr, position); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Retrieve the key at the specified position. /// /// The specified position @@ -940,32 +915,12 @@ namespace Tizen.NUI return ret; } - internal StringValuePair GetPair(uint position) - { - StringValuePair ret = new StringValuePair(NDalicPINVOKE.Property_Map_GetPair(swigCPtr, position), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Finds the value for the specified key if it exists. - /// - /// The key to find - /// The value if it exists, an empty object otherwise - public PropertyValue Find(string key) - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_0(swigCPtr, key); - PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Finds the value for the specified key if it exists. /// /// The key to find /// The value if it exists, an empty object otherwise - public PropertyValue Find(int key) + internal PropertyValue Find(int key) { global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_2(swigCPtr, key); PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); @@ -988,34 +943,6 @@ namespace Tizen.NUI } /// - /// Finds the value for the specified key if it exists and its type is type. - /// - /// The key to find - /// The type to check - /// The value if it exists, an empty value otherwise - public PropertyValue Find(string key, PropertyType type) - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_4(swigCPtr, key, (int)type); - PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Finds the value for the specified key if it exists and its type is type. - /// - /// The key to find - /// The type to check - /// The value if it exists, an empty value otherwise - public PropertyValue Find(int key, PropertyType type) - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Map_Find__SWIG_5(swigCPtr, key, (int)type); - PropertyValue ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyValue(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Clears the map. /// public void Clear() @@ -1040,7 +967,7 @@ namespace Tizen.NUI /// /// The key whose value to retrieve /// The value for the element with the specified key - public PropertyValue ValueOfIndex(string key) + internal PropertyValue ValueOfIndex(string key) { PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_0(swigCPtr, key), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -1052,25 +979,12 @@ namespace Tizen.NUI /// /// The key whose value to retrieve /// The value for the element with the specified key - public PropertyValue ValueOfIndex(int key) + internal PropertyValue ValueOfIndex(int key) { PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Map_ValueOfIndex__SWIG_2(swigCPtr, key), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - /// - /// Copy the map. - /// - /// The map to copy from - /// The copied map - internal PropertyMap Assign(PropertyMap other) - { - PropertyMap ret = new PropertyMap(NDalicPINVOKE.Property_Map_Assign(swigCPtr, PropertyMap.getCPtr(other)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } /// @@ -1492,18 +1406,6 @@ namespace Tizen.NUI } /// - /// Copy the value. - /// - /// The value to copy from - /// The copied value - internal PropertyValue Assign(PropertyValue value) - { - PropertyValue ret = new PropertyValue(NDalicPINVOKE.Property_Value_Assign(swigCPtr, PropertyValue.getCPtr(value)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Queries the type of this property value. /// /// The type ID @@ -1519,9 +1421,9 @@ namespace Tizen.NUI /// /// On return, a boolean value /// Returns true if the value is successfully retrieved, false if the type is not convertible - public bool Get(ref bool boolValue) + public bool Get(out bool boolValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_1(swigCPtr, ref boolValue); + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_1(swigCPtr, out boolValue); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -1531,9 +1433,9 @@ namespace Tizen.NUI /// /// On return, a floating-point value /// Returns true if the value is successfully retrieved, false if the type is not convertible - public bool Get(ref float floatValue) + public bool Get(out float floatValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_2(swigCPtr, ref floatValue); + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_2(swigCPtr, out floatValue); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -1543,9 +1445,9 @@ namespace Tizen.NUI /// /// On return, a integer value /// Returns true if the value is successfully retrieved, false if the type is not convertible - public bool Get(ref int integerValue) + public bool Get(out int integerValue) { - bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_3(swigCPtr, ref integerValue); + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_3(swigCPtr, out integerValue); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } @@ -1666,30 +1568,5 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - /// - /// Retrieves the Array API of the Property::Value without copying the contents of the map. - /// - /// The Array API of the Property::Value or NULL if not a Property::Array - public PropertyArray GetArray() - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetArray(swigCPtr); - PropertyArray ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyArray(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Retrieves the Map API of the Property::Value without copying the contents of the map. - /// - /// The Map API of the Property::Value or NULL if not a Property::Map - public PropertyMap GetMap() - { - global::System.IntPtr cPtr = NDalicPINVOKE.Property_Value_GetMap(swigCPtr); - PropertyMap ret = (cPtr == global::System.IntPtr.Zero) ? null : new PropertyMap(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } } diff --git a/src/Tizen.NUI/src/public/Radian.cs b/src/Tizen.NUI/src/public/Radian.cs index 6fc8f47..36de9bc 100755 --- a/src/Tizen.NUI/src/public/Radian.cs +++ b/src/Tizen.NUI/src/public/Radian.cs @@ -123,30 +123,6 @@ namespace Tizen.NUI } /// - /// Assigns an angle from a float value. - /// - /// Float value in radians - /// A reference to this - internal Radian Assign(float value) - { - Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_0(swigCPtr, value), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Assigns an angle from a Degree value. - /// - /// The value in degrees - /// A reference to this - internal Radian Assign(Degree degree) - { - Radian ret = new Radian(NDalicPINVOKE.Radian_Assign__SWIG_1(swigCPtr, Degree.getCPtr(degree)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Conversion to float. /// /// The float value of this Radian @@ -160,7 +136,7 @@ namespace Tizen.NUI /// /// The value in radians /// - public float radian + public float Value { set { diff --git a/src/Tizen.NUI/src/public/Rectangle.cs b/src/Tizen.NUI/src/public/Rectangle.cs index aaeb533..95ae7ee 100755 --- a/src/Tizen.NUI/src/public/Rectangle.cs +++ b/src/Tizen.NUI/src/public/Rectangle.cs @@ -211,27 +211,6 @@ namespace Tizen.NUI } /// - /// Copy constructor. - /// - /// The original object - public Rectangle(Rectangle rhs) : this(NDalicPINVOKE.new_Rectangle__SWIG_2(Rectangle.getCPtr(rhs)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Make reference of original Rectangle object. - /// - /// The original object - /// Reference to this - public Rectangle Assign(Rectangle rhs) - { - Rectangle ret = new Rectangle(NDalicPINVOKE.Rectangle_Assign(swigCPtr, Rectangle.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Assignment from individual values. /// /// X coordinate diff --git a/src/Tizen.NUI/src/public/Scrollable.cs b/src/Tizen.NUI/src/public/Scrollable.cs index 0a31f59..f6edecc 100755 --- a/src/Tizen.NUI/src/public/Scrollable.cs +++ b/src/Tizen.NUI/src/public/Scrollable.cs @@ -50,7 +50,7 @@ namespace Tizen.NUI //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -271,93 +271,8 @@ namespace Tizen.NUI } - public class Property : global::System.IDisposable + public class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Scrollable_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - public Property() : this(NDalicPINVOKE.new_Scrollable_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static readonly int OVERSHOOT_EFFECT_COLOR = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_EFFECT_COLOR_get(); public static readonly int OVERSHOOT_ANIMATION_SPEED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ANIMATION_SPEED_get(); public static readonly int OVERSHOOT_ENABLED = NDalicPINVOKE.Scrollable_Property_OVERSHOOT_ENABLED_get(); @@ -380,58 +295,46 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Scrollable(Scrollable handle) : this(NDalicPINVOKE.new_Scrollable__SWIG_1(Scrollable.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public Scrollable Assign(Scrollable handle) - { - Scrollable ret = new Scrollable(NDalicPINVOKE.Scrollable_Assign(swigCPtr, Scrollable.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static Scrollable DownCast(BaseHandle handle) + internal new static Scrollable DownCast(BaseHandle handle) { Scrollable ret = new Scrollable(NDalicPINVOKE.Scrollable_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public bool IsOvershootEnabled() + private bool IsOvershootEnabled() { bool ret = NDalicPINVOKE.Scrollable_IsOvershootEnabled(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetOvershootEnabled(bool enable) + private void SetOvershootEnabled(bool enable) { NDalicPINVOKE.Scrollable_SetOvershootEnabled(swigCPtr, enable); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void SetOvershootEffectColor(Vector4 color) + private void SetOvershootEffectColor(Vector4 color) { NDalicPINVOKE.Scrollable_SetOvershootEffectColor(swigCPtr, Vector4.getCPtr(color)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public Vector4 GetOvershootEffectColor() + private Vector4 GetOvershootEffectColor() { Vector4 ret = new Vector4(NDalicPINVOKE.Scrollable_GetOvershootEffectColor(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public void SetOvershootAnimationSpeed(float pixelsPerSecond) + private void SetOvershootAnimationSpeed(float pixelsPerSecond) { NDalicPINVOKE.Scrollable_SetOvershootAnimationSpeed(swigCPtr, pixelsPerSecond); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public float GetOvershootAnimationSpeed() + private float GetOvershootAnimationSpeed() { float ret = NDalicPINVOKE.Scrollable_GetOvershootAnimationSpeed(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -459,14 +362,6 @@ namespace Tizen.NUI return ret; } - public enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - public Vector4 OvershootEffectColor { get @@ -485,7 +380,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get(ref temp); + GetProperty(Scrollable.Property.OVERSHOOT_ANIMATION_SPEED).Get(out temp); return temp; } set @@ -498,7 +393,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(Scrollable.Property.OVERSHOOT_ENABLED).Get(ref temp); + GetProperty(Scrollable.Property.OVERSHOOT_ENABLED).Get(out temp); return temp; } set @@ -524,7 +419,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get(ref temp); + GetProperty(Scrollable.Property.SCROLL_TO_ALPHA_FUNCTION).Get(out temp); return temp; } set @@ -576,7 +471,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(Scrollable.Property.CAN_SCROLL_VERTICAL).Get(ref temp); + GetProperty(Scrollable.Property.CAN_SCROLL_VERTICAL).Get(out temp); return temp; } set @@ -589,7 +484,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get(ref temp); + GetProperty(Scrollable.Property.CAN_SCROLL_HORIZONTAL).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/StyleManager.cs b/src/Tizen.NUI/src/public/StyleManager.cs index 738bef0..8502ddc 100755 --- a/src/Tizen.NUI/src/public/StyleManager.cs +++ b/src/Tizen.NUI/src/public/StyleManager.cs @@ -214,7 +214,7 @@ namespace Tizen.NUI /// /// The key of the constant /// The value of the constant - public void SetStyleConstant(string key, PropertyValue value) + public void AddConstant(string key, PropertyValue value) { NDalicPINVOKE.StyleManager_SetStyleConstant(swigCPtr, key, PropertyValue.getCPtr(value)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -226,7 +226,7 @@ namespace Tizen.NUI /// The key of the constant /// The value of the constant if it exists /// - public bool GetStyleConstant(string key, PropertyValue valueOut) + public bool GetConstant(string key, PropertyValue valueOut) { bool ret = NDalicPINVOKE.StyleManager_GetStyleConstant(swigCPtr, key, PropertyValue.getCPtr(valueOut)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/TableView.cs b/src/Tizen.NUI/src/public/TableView.cs index 63273a7..01a94ea 100755 --- a/src/Tizen.NUI/src/public/TableView.cs +++ b/src/Tizen.NUI/src/public/TableView.cs @@ -83,192 +83,22 @@ namespace Tizen.NUI } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TableView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - public Property() : this(NDalicPINVOKE.new_TableView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int ROWS = NDalicPINVOKE.TableView_Property_ROWS_get(); internal static readonly int COLUMNS = NDalicPINVOKE.TableView_Property_COLUMNS_get(); internal static readonly int CELL_PADDING = NDalicPINVOKE.TableView_Property_CELL_PADDING_get(); internal static readonly int LAYOUT_ROWS = NDalicPINVOKE.TableView_Property_LAYOUT_ROWS_get(); internal static readonly int LAYOUT_COLUMNS = NDalicPINVOKE.TableView_Property_LAYOUT_COLUMNS_get(); - } - internal class ChildProperty : global::System.IDisposable + internal class ChildProperty { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ChildProperty(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ChildProperty obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~ChildProperty() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_TableView_ChildProperty(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - public ChildProperty() : this(NDalicPINVOKE.new_TableView_ChildProperty(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int CELL_INDEX = NDalicPINVOKE.TableView_ChildProperty_CELL_INDEX_get(); internal static readonly int ROW_SPAN = NDalicPINVOKE.TableView_ChildProperty_ROW_SPAN_get(); internal static readonly int COLUMN_SPAN = NDalicPINVOKE.TableView_ChildProperty_COLUMN_SPAN_get(); internal static readonly int CELL_HORIZONTAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_HORIZONTAL_ALIGNMENT_get(); internal static readonly int CELL_VERTICAL_ALIGNMENT = NDalicPINVOKE.TableView_ChildProperty_CELL_VERTICAL_ALIGNMENT_get(); - } /// @@ -500,25 +330,13 @@ namespace Tizen.NUI } /// - /// Changes this handle to point to another real object. - /// - /// Handle to an object - /// A reference to this - public TableView Assign(TableView handle) - { - TableView ret = new TableView(NDalicPINVOKE.TableView_Assign(swigCPtr, TableView.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Downcasts a handle to TableView handle.
/// If handle points to a TableView, the downcast produces valid handle.
/// If not, the returned handle is left uninitialized.
/// /// Handle to an object /// Handle to a TableView or an uninitialized handle - public new static TableView DownCast(BaseHandle handle) + internal new static TableView DownCast(BaseHandle handle) { TableView ret = new TableView(NDalicPINVOKE.TableView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -793,28 +611,6 @@ namespace Tizen.NUI } /// - /// Gets the amount of rows in the table. - /// - /// The amount of rows in the table - public uint GetRows() - { - uint ret = NDalicPINVOKE.TableView_GetRows(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Gets the amount of columns in the table. - /// - /// The amount of columns in the table - public uint GetColumns() - { - uint ret = NDalicPINVOKE.TableView_GetColumns(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// /// Sets the alignment on a cell.
/// Cells without calling this function have the default values of LEFT and TOP respectively.
/// @@ -827,14 +623,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - CHILD_PROPERTY_START_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX, - CHILD_PROPERTY_END_INDEX = PropertyRanges.CHILD_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - /// /// Enumeration for describing how the size of a row / column has been set. /// @@ -854,7 +642,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(TableView.Property.ROWS).Get(ref temp); + GetProperty(TableView.Property.ROWS).Get(out temp); return temp; } set @@ -870,7 +658,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(TableView.Property.COLUMNS).Get(ref temp); + GetProperty(TableView.Property.COLUMNS).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/TapGesture.cs b/src/Tizen.NUI/src/public/TapGesture.cs index 4eb7c0a..29745bc 100755 --- a/src/Tizen.NUI/src/public/TapGesture.cs +++ b/src/Tizen.NUI/src/public/TapGesture.cs @@ -127,26 +127,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - /// - /// Copy constructor. - /// - /// TapGesture to copy - public TapGesture(TapGesture rhs) : this(NDalicPINVOKE.new_TapGesture__SWIG_1(TapGesture.getCPtr(rhs)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Assignment - /// - /// A reference to the copied handle - /// A reference to this - public TapGesture Assign(TapGesture rhs) - { - TapGesture ret = new TapGesture(NDalicPINVOKE.TapGesture_Assign(swigCPtr, TapGesture.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } private uint numberOfTaps { diff --git a/src/Tizen.NUI/src/public/Timer.cs b/src/Tizen.NUI/src/public/Timer.cs index 90a6b24..44447cd 100755 --- a/src/Tizen.NUI/src/public/Timer.cs +++ b/src/Tizen.NUI/src/public/Timer.cs @@ -151,19 +151,12 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Timer Assign(Timer timer) - { - Timer ret = new Timer(NDalicPINVOKE.Timer_Assign(swigCPtr, Timer.getCPtr(timer)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to Timer handle. /// /// handle to An object /// handle to a Timer object or an uninitialized handle - public static Timer DownCast(BaseHandle handle) + internal static Timer DownCast(BaseHandle handle) { Timer ret = new Timer(NDalicPINVOKE.Timer_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Touch.cs b/src/Tizen.NUI/src/public/Touch.cs index 742e8e7..5ad5cf2 100755 --- a/src/Tizen.NUI/src/public/Touch.cs +++ b/src/Tizen.NUI/src/public/Touch.cs @@ -83,13 +83,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Touch Assign(Touch other) - { - Touch ret = new Touch(NDalicPINVOKE.Touch_Assign(swigCPtr, Touch.getCPtr(other)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Returns the time (in ms) that the touch event occurred. /// diff --git a/src/Tizen.NUI/src/public/TransitionData.cs b/src/Tizen.NUI/src/public/TransitionData.cs index 6de51d7..0bbd686 100755 --- a/src/Tizen.NUI/src/public/TransitionData.cs +++ b/src/Tizen.NUI/src/public/TransitionData.cs @@ -83,7 +83,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public static TransitionData DownCast(BaseHandle handle) + internal static TransitionData DownCast(BaseHandle handle) { TransitionData ret = new TransitionData(NDalicPINVOKE.TransitionData_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -95,13 +95,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TransitionData Assign(TransitionData handle) - { - TransitionData ret = new TransitionData(NDalicPINVOKE.TransitionData_Assign(swigCPtr, TransitionData.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public uint Count() { uint ret = NDalicPINVOKE.TransitionData_Count(swigCPtr); diff --git a/src/Tizen.NUI/src/internal/TypeInfo.cs b/src/Tizen.NUI/src/public/TypeInfo.cs similarity index 73% rename from src/Tizen.NUI/src/internal/TypeInfo.cs rename to src/Tizen.NUI/src/public/TypeInfo.cs index 2107cd3..b21de27 100755 --- a/src/Tizen.NUI/src/internal/TypeInfo.cs +++ b/src/Tizen.NUI/src/public/TypeInfo.cs @@ -68,13 +68,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public TypeInfo Assign(TypeInfo rhs) - { - TypeInfo ret = new TypeInfo(NDalicPINVOKE.TypeInfo_Assign(swigCPtr, TypeInfo.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public string GetName() { string ret = NDalicPINVOKE.TypeInfo_GetName(swigCPtr); @@ -96,34 +89,6 @@ namespace Tizen.NUI return ret; } - public uint GetActionCount() - { - uint ret = NDalicPINVOKE.TypeInfo_GetActionCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public string GetActionName(uint index) - { - string ret = NDalicPINVOKE.TypeInfo_GetActionName(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public uint GetSignalCount() - { - uint ret = NDalicPINVOKE.TypeInfo_GetSignalCount(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public string GetSignalName(uint index) - { - string ret = NDalicPINVOKE.TypeInfo_GetSignalName(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public uint GetPropertyCount() { uint ret = NDalicPINVOKE.TypeInfo_GetPropertyCount(swigCPtr); diff --git a/src/Tizen.NUI/src/public/UIComponents/Button.cs b/src/Tizen.NUI/src/public/UIComponents/Button.cs index 51a416c..2f6422f 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Button.cs +++ b/src/Tizen.NUI/src/public/UIComponents/Button.cs @@ -489,101 +489,22 @@ namespace Tizen.NUI.UIComponents /// /// Gets/Sets the padding around the foreground visual /// - public Vector4 VisualPadding + public Vector4 ForegroundVisualPadding { get { Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(Button.Property.VISUAL_PADDING).Get(temp); + GetProperty(Button.Property.FOREGROUND_VISUAL_PADDING).Get(temp); return temp; } set { - SetProperty(Button.Property.VISUAL_PADDING, new Tizen.NUI.PropertyValue(value)); + SetProperty(Button.Property.FOREGROUND_VISUAL_PADDING, new Tizen.NUI.PropertyValue(value)); } } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Button_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - internal static readonly int UNSELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_UNSELECTED_VISUAL_get(); internal static readonly int SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_SELECTED_VISUAL_get(); internal static readonly int DISABLED_SELECTED_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_VISUAL_get(); @@ -594,14 +515,7 @@ namespace Tizen.NUI.UIComponents internal static readonly int DISABLED_SELECTED_BACKGROUND_VISUAL = NDalicManualPINVOKE.Button_Property_DISABLED_SELECTED_BACKGROUND_VISUAL_get(); internal static readonly int LABEL_RELATIVE_ALIGNMENT = NDalicManualPINVOKE.Button_Property_LABEL_RELATIVE_ALIGNMENT_get(); internal static readonly int LABEL_PADDING = NDalicManualPINVOKE.Button_Property_LABEL_PADDING_get(); - internal static readonly int VISUAL_PADDING = NDalicManualPINVOKE.Button_Property_VISUAL_PADDING_get(); - //changed - internal Property() : this(NDalicPINVOKE.new_Button_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal static readonly int DISABLED = NDalicPINVOKE.Button_Property_DISABLED_get(); + internal static readonly int FOREGROUND_VISUAL_PADDING = NDalicManualPINVOKE.Button_Property_VISUAL_PADDING_get(); internal static readonly int AUTO_REPEATING = NDalicPINVOKE.Button_Property_AUTO_REPEATING_get(); internal static readonly int INITIAL_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_INITIAL_AUTO_REPEATING_DELAY_get(); internal static readonly int NEXT_AUTO_REPEATING_DELAY = NDalicPINVOKE.Button_Property_NEXT_AUTO_REPEATING_DELAY_get(); @@ -610,8 +524,6 @@ namespace Tizen.NUI.UIComponents internal static readonly int UNSELECTED_COLOR = NDalicPINVOKE.Button_Property_UNSELECTED_COLOR_get(); internal static readonly int SELECTED_COLOR = NDalicPINVOKE.Button_Property_SELECTED_COLOR_get(); internal static readonly int LABEL = NDalicPINVOKE.Button_Property_LABEL_get(); - internal static readonly int LABEL_TEXT = NDalicPINVOKE.Button_Property_LABEL_TEXT_get(); - } /// @@ -623,18 +535,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Button(Button button) : this(NDalicPINVOKE.new_Button__SWIG_1(Button.getCPtr(button)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Button Assign(Button button) - { - Button ret = new Button(NDalicPINVOKE.Button_Assign(swigCPtr, Button.getCPtr(button)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to Button handle.
/// If handle points to a Button, the downcast produces valid handle.
@@ -642,105 +542,13 @@ namespace Tizen.NUI.UIComponents /// /// Handle to an object /// A handle to a Button or an uninitialized handle - public new static Button DownCast(BaseHandle handle) + internal new static Button DownCast(BaseHandle handle) { Button ret = new Button(NDalicPINVOKE.Button_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool IsDisabled() - { - bool ret = NDalicPINVOKE.Button_IsDisabled(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool IsAutoRepeating() - { - bool ret = NDalicPINVOKE.Button_IsAutoRepeating(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal float GetInitialAutoRepeatingDelay() - { - float ret = NDalicPINVOKE.Button_GetInitialAutoRepeatingDelay(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal float GetNextAutoRepeatingDelay() - { - float ret = NDalicPINVOKE.Button_GetNextAutoRepeatingDelay(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool IsTogglableButton() - { - bool ret = NDalicPINVOKE.Button_IsTogglableButton(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal bool IsSelected() - { - bool ret = NDalicPINVOKE.Button_IsSelected(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Retrieves button's animation time. - /// - /// - public float GetAnimationTime() - { - float ret = NDalicPINVOKE.Button_GetAnimationTime(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal string GetLabelText() - { - string ret = NDalicPINVOKE.Button_GetLabelText(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal void SetLabel(View label) - { - NDalicPINVOKE.Button_SetLabel(swigCPtr, View.getCPtr(label)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetButtonImage(Image image) - { - NDalicPINVOKE.Button_SetButtonImage(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSelectedImage(Image image) - { - NDalicPINVOKE.Button_SetSelectedImage(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal View GetButtonImage() - { - View ret = new View(NDalicPINVOKE.Button_GetButtonImage(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal View GetSelectedImage() - { - View ret = new View(NDalicPINVOKE.Button_GetSelectedImage(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - internal ButtonSignal PressedSignal() { ButtonSignal ret = new ButtonSignal(NDalicPINVOKE.Button_PressedSignal(swigCPtr), false); @@ -769,29 +577,6 @@ namespace Tizen.NUI.UIComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - - /// - /// Gets/Sets the button as disabled. - /// - public bool Disabled - { - get - { - bool temp = false; - GetProperty(Button.Property.DISABLED).Get(ref temp); - return temp; - } - set - { - SetProperty(Button.Property.DISABLED, new Tizen.NUI.PropertyValue(value)); - } - } - /// /// If the autorepeating property is set to true then the togglable property is set to false. /// @@ -800,7 +585,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Button.Property.AUTO_REPEATING).Get(ref temp); + GetProperty(Button.Property.AUTO_REPEATING).Get(out temp); return temp; } set @@ -817,7 +602,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get(ref temp); + GetProperty(Button.Property.INITIAL_AUTO_REPEATING_DELAY).Get(out temp); return temp; } set @@ -834,7 +619,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Button.Property.NEXT_AUTO_REPEATING_DELAY).Get(ref temp); + GetProperty(Button.Property.NEXT_AUTO_REPEATING_DELAY).Get(out temp); return temp; } set @@ -851,7 +636,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Button.Property.TOGGLABLE).Get(ref temp); + GetProperty(Button.Property.TOGGLABLE).Get(out temp); return temp; } set @@ -868,7 +653,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Button.Property.SELECTED).Get(ref temp); + GetProperty(Button.Property.SELECTED).Get(out temp); return temp; } set @@ -935,13 +720,16 @@ namespace Tizen.NUI.UIComponents { get { - string temp; - GetProperty(Button.Property.LABEL_TEXT).Get(out temp); - return temp; + Tizen.NUI.PropertyMap map = new Tizen.NUI.PropertyMap(); + GetProperty( Button.Property.LABEL).Get(map); + Tizen.NUI.PropertyValue value = map.Find( TextVisualProperty.Text, "Text"); + string str; + value.Get(out str); + return str; } set { - SetProperty(Button.Property.LABEL_TEXT, new Tizen.NUI.PropertyValue(value)); + SetProperty( Button.Property.LABEL, new Tizen.NUI.PropertyValue( value ) ); } } diff --git a/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs index d0392c1..d8fe161 100755 --- a/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/CheckBoxButton.cs @@ -84,17 +84,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal CheckBoxButton(CheckBoxButton checkBox) : this(NDalicPINVOKE.new_CheckBoxButton__SWIG_1(CheckBoxButton.getCPtr(checkBox)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal CheckBoxButton Assign(CheckBoxButton checkBox) - { - CheckBoxButton ret = new CheckBoxButton(NDalicPINVOKE.CheckBoxButton_Assign(swigCPtr, CheckBoxButton.getCPtr(checkBox)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } internal new static CheckBoxButton DownCast(BaseHandle handle) { diff --git a/src/Tizen.NUI/src/public/UIComponents/Popup.cs b/src/Tizen.NUI/src/public/UIComponents/Popup.cs index d451c38..98b69be 100755 --- a/src/Tizen.NUI/src/public/UIComponents/Popup.cs +++ b/src/Tizen.NUI/src/public/UIComponents/Popup.cs @@ -70,7 +70,7 @@ namespace Tizen.NUI.UIComponents //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -330,93 +330,8 @@ namespace Tizen.NUI.UIComponents } } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_Popup_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_Popup_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int TITLE = NDalicPINVOKE.Popup_Property_TITLE_get(); internal static readonly int CONTENT = NDalicPINVOKE.Popup_Property_CONTENT_get(); internal static readonly int FOOTER = NDalicPINVOKE.Popup_Property_FOOTER_get(); @@ -438,7 +353,6 @@ namespace Tizen.NUI.UIComponents internal static readonly int TAIL_DOWN_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_DOWN_IMAGE_get(); internal static readonly int TAIL_LEFT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_LEFT_IMAGE_get(); internal static readonly int TAIL_RIGHT_IMAGE = NDalicPINVOKE.Popup_Property_TAIL_RIGHT_IMAGE_get(); - } /// @@ -449,17 +363,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Popup(Popup handle) : this(NDalicPINVOKE.new_Popup__SWIG_1(Popup.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Popup Assign(Popup handle) - { - Popup ret = new Popup(NDalicPINVOKE.Popup_Assign(swigCPtr, Popup.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Downcasts a handle to Popup handle.
@@ -591,12 +494,6 @@ namespace Tizen.NUI.UIComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - /// /// The display states of the Popup. /// @@ -752,7 +649,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Popup.Property.TOUCH_TRANSPARENT).Get(ref temp); + GetProperty(Popup.Property.TOUCH_TRANSPARENT).Get(out temp); return temp; } set @@ -768,7 +665,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Popup.Property.TAIL_VISIBILITY).Get(ref temp); + GetProperty(Popup.Property.TAIL_VISIBILITY).Get(out temp); return temp; } set @@ -869,7 +766,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(Popup.Property.ANIMATION_DURATION).Get(ref temp); + GetProperty(Popup.Property.ANIMATION_DURATION).Get(out temp); return temp; } set @@ -979,7 +876,7 @@ namespace Tizen.NUI.UIComponents get { int temp = 0; - GetProperty(Popup.Property.AUTO_HIDE_DELAY).Get(ref temp); + GetProperty(Popup.Property.AUTO_HIDE_DELAY).Get(out temp); return temp; } set @@ -995,7 +892,7 @@ namespace Tizen.NUI.UIComponents get { bool temp = false; - GetProperty(Popup.Property.BACKING_ENABLED).Get(ref temp); + GetProperty(Popup.Property.BACKING_ENABLED).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs index cc8bc92..c6ec224 100755 --- a/src/Tizen.NUI/src/public/UIComponents/PushButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/PushButton.cs @@ -65,7 +65,7 @@ namespace Tizen.NUI.UIComponents //Release your own unmanaged resources here. //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. + //because the execution order of Finalizes is non-deterministic. if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -81,98 +81,13 @@ namespace Tizen.NUI.UIComponents } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_PushButton_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_PushButton_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int UNSELECTED_ICON = NDalicPINVOKE.PushButton_Property_UNSELECTED_ICON_get(); internal static readonly int SELECTED_ICON = NDalicPINVOKE.PushButton_Property_SELECTED_ICON_get(); internal static readonly int ICON_ALIGNMENT = NDalicPINVOKE.PushButton_Property_ICON_ALIGNMENT_get(); internal static readonly int LABEL_PADDING = NDalicPINVOKE.PushButton_Property_LABEL_PADDING_get(); internal static readonly int ICON_PADDING = NDalicPINVOKE.PushButton_Property_ICON_PADDING_get(); - } /// @@ -183,17 +98,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal PushButton(PushButton pushButton) : this(NDalicPINVOKE.new_PushButton__SWIG_1(PushButton.getCPtr(pushButton)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal PushButton Assign(PushButton pushButton) - { - PushButton ret = new PushButton(NDalicPINVOKE.PushButton_Assign(swigCPtr, PushButton.getCPtr(pushButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Downcasts a handle to PushButton handle.
@@ -202,216 +106,11 @@ namespace Tizen.NUI.UIComponents /// /// Handle to an object /// handle to a PushButton or an uninitialized handle - public new static PushButton DownCast(BaseHandle handle) + internal new static PushButton DownCast(BaseHandle handle) { PushButton ret = new PushButton(NDalicPINVOKE.PushButton_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - - internal new void SetButtonImage(Image image) - { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_0_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetButtonImage(View image) - { - NDalicPINVOKE.PushButton_SetButtonImage__SWIG_1(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetBackgroundImage(View image) - { - NDalicPINVOKE.PushButton_SetBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal new void SetSelectedImage(Image image) - { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_0_0(swigCPtr, Image.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSelectedImage(View image) - { - NDalicPINVOKE.PushButton_SetSelectedImage__SWIG_1(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetSelectedBackgroundImage(View image) - { - NDalicPINVOKE.PushButton_SetSelectedBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetDisabledBackgroundImage(View image) - { - NDalicPINVOKE.PushButton_SetDisabledBackgroundImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetDisabledImage(View image) - { - NDalicPINVOKE.PushButton_SetDisabledImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal void SetDisabledSelectedImage(View image) - { - NDalicPINVOKE.PushButton_SetDisabledSelectedImage(swigCPtr, View.getCPtr(image)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - - /// - /// Sets the unselected button image. - /// - public string UnselectedIcon - { - set - { - SetProperty(PushButton.Property.UNSELECTED_ICON, new Tizen.NUI.PropertyValue(value)); - } - } - /// - /// Sets the selected button image. - /// - public string SelectedIcon - { - set - { - SetProperty(PushButton.Property.SELECTED_ICON, new Tizen.NUI.PropertyValue(value)); - } - } - /// - /// Sets the icon alignment. - /// - public IconAlignmentType IconAlignment - { - get - { - string temp; - if (GetProperty(PushButton.Property.ICON_ALIGNMENT).Get(out temp) == false) - { -#if DEBUG_ON - Tizen.Log.Error("NUI", "IconAlignment get error!"); -#endif - } - switch (temp) - { - case "LEFT": - return IconAlignmentType.Left; - case "RIGHT": - return IconAlignmentType.Right; - case "TOP": - return IconAlignmentType.Top; - case "BOTTOM": - return IconAlignmentType.Bottom; - default: - return IconAlignmentType.Default; - } - } - set - { - string valueToString = ""; - switch (value) - { - case IconAlignmentType.Left: - { - valueToString = "LEFT"; - break; - } - case IconAlignmentType.Right: - { - valueToString = "RIGHT"; - break; - } - case IconAlignmentType.Top: - { - valueToString = "TOP"; - break; - } - case IconAlignmentType.Bottom: - { - valueToString = "BOTTOM"; - break; - } - default: - { - valueToString = "DEFAULT"; - break; - } - } - SetProperty(PushButton.Property.ICON_ALIGNMENT, new Tizen.NUI.PropertyValue(valueToString)); - } - } - /// - /// Sets the label padding value. - /// - public Vector4 LabelPadding - { - get - { - Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(PushButton.Property.LABEL_PADDING).Get(temp); - return temp; - } - set - { - SetProperty(PushButton.Property.LABEL_PADDING, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Sets the icon padding value. - /// - public Vector4 IconPadding - { - get - { - Vector4 temp = new Vector4(0.0f, 0.0f, 0.0f, 0.0f); - GetProperty(PushButton.Property.ICON_PADDING).Get(temp); - return temp; - } - set - { - SetProperty(PushButton.Property.ICON_PADDING, new Tizen.NUI.PropertyValue(value)); - } - } - - /// - /// Enumeration for the alignment modes of the icon. - /// - public enum IconAlignmentType - { - /// - /// Icon located to the left of text. - /// - Left, - /// - /// Icon located to the right of text. - /// - Right, - /// - /// Icon located to the top of text. - /// - Top, - /// - /// Icon located to the bottom of text. - /// - Bottom, - /// - /// Icon located to the right of text by default. - /// - Default = Right - } - } - } diff --git a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs index 150ffb2..709dc38 100755 --- a/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/RadioButton.cs @@ -76,7 +76,7 @@ namespace Tizen.NUI.UIComponents //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -109,17 +109,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal RadioButton(RadioButton radioButton) : this(NDalicPINVOKE.new_RadioButton__SWIG_1(RadioButton.getCPtr(radioButton)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal RadioButton Assign(RadioButton radioButton) - { - RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_Assign(swigCPtr, RadioButton.getCPtr(radioButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Downcasts a handle to RadioButton handle. @@ -128,7 +117,7 @@ namespace Tizen.NUI.UIComponents /// /// Handle to an object /// A handle to a RadioButton or an uninitialized handle - public new static RadioButton DownCast(BaseHandle handle) + internal new static RadioButton DownCast(BaseHandle handle) { RadioButton ret = new RadioButton(NDalicPINVOKE.RadioButton_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 7b4f6b5..3d2e887 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI.UIComponents using System; using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; - + /// /// ScrollBar is a UI component that can be linked to the scrollable objects /// indicating the current scroll position of the scrollable object.
@@ -70,7 +70,7 @@ namespace Tizen.NUI.UIComponents //Release your own unmanaged resources here. //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. + //because the execution order of Finalizes is non-deterministic. if (swigCPtr.Handle != global::System.IntPtr.Zero) { @@ -199,92 +199,8 @@ namespace Tizen.NUI.UIComponents } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ScrollBar_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_ScrollBar_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int SCROLL_DIRECTION = NDalicPINVOKE.ScrollBar_Property_SCROLL_DIRECTION_get(); internal static readonly int INDICATOR_HEIGHT_POLICY = NDalicPINVOKE.ScrollBar_Property_INDICATOR_HEIGHT_POLICY_get(); internal static readonly int INDICATOR_FIXED_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_FIXED_HEIGHT_get(); @@ -294,7 +210,6 @@ namespace Tizen.NUI.UIComponents internal static readonly int INDICATOR_MINIMUM_HEIGHT = NDalicPINVOKE.ScrollBar_Property_INDICATOR_MINIMUM_HEIGHT_get(); internal static readonly int INDICATOR_START_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_START_PADDING_get(); internal static readonly int INDICATOR_END_PADDING = NDalicPINVOKE.ScrollBar_Property_INDICATOR_END_PADDING_get(); - } /// @@ -319,13 +234,6 @@ namespace Tizen.NUI.UIComponents if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal ScrollBar Assign(ScrollBar scrollBar) - { - ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_Assign(swigCPtr, ScrollBar.getCPtr(scrollBar)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to ScrollBar handle.
/// If handle points to a ScrollBar, the downcast produces valid handle.
@@ -333,7 +241,7 @@ namespace Tizen.NUI.UIComponents /// /// Handle to an object /// Handle to a ScrollBar or an uninitialized handle - public new static ScrollBar DownCast(BaseHandle handle) + internal new static ScrollBar DownCast(BaseHandle handle) { ScrollBar ret = new ScrollBar(NDalicPINVOKE.ScrollBar_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -450,12 +358,6 @@ namespace Tizen.NUI.UIComponents return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - /// /// Direction of scroll bar /// @@ -582,7 +484,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get(ref temp); + GetProperty(ScrollBar.Property.INDICATOR_FIXED_HEIGHT).Get(out temp); return temp; } set @@ -599,7 +501,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ScrollBar.Property.INDICATOR_SHOW_DURATION).Get(ref temp); + GetProperty(ScrollBar.Property.INDICATOR_SHOW_DURATION).Get(out temp); return temp; } set @@ -616,7 +518,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ScrollBar.Property.INDICATOR_HIDE_DURATION).Get(ref temp); + GetProperty(ScrollBar.Property.INDICATOR_HIDE_DURATION).Get(out temp); return temp; } set @@ -650,7 +552,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get(ref temp); + GetProperty(ScrollBar.Property.INDICATOR_MINIMUM_HEIGHT).Get(out temp); return temp; } set @@ -667,7 +569,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ScrollBar.Property.INDICATOR_START_PADDING).Get(ref temp); + GetProperty(ScrollBar.Property.INDICATOR_START_PADDING).Get(out temp); return temp; } set @@ -684,7 +586,7 @@ namespace Tizen.NUI.UIComponents get { float temp = 0.0f; - GetProperty(ScrollBar.Property.INDICATOR_END_PADDING).Get(ref temp); + GetProperty(ScrollBar.Property.INDICATOR_END_PADDING).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs index 9fd9ae8..b521e63 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ScrollView.cs @@ -64,7 +64,7 @@ namespace Tizen.NUI //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -163,96 +163,6 @@ namespace Tizen.NUI } } - - public class ClampEvent : global::System.IDisposable - { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal ClampEvent(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ClampEvent obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~ClampEvent() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ScrollView_ClampEvent(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - public ClampEvent() : this(NDalicPINVOKE.new_ScrollView_ClampEvent(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - } - public class SnapEvent : global::System.IDisposable { private global::System.Runtime.InteropServices.HandleRef swigCPtr; @@ -395,93 +305,8 @@ namespace Tizen.NUI } - public class Property : global::System.IDisposable + public class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ScrollView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - public Property() : this(NDalicPINVOKE.new_ScrollView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static readonly int WRAP_ENABLED = NDalicPINVOKE.ScrollView_Property_WRAP_ENABLED_get(); public static readonly int PANNING_ENABLED = NDalicPINVOKE.ScrollView_Property_PANNING_ENABLED_get(); public static readonly int AXIS_AUTO_LOCK_ENABLED = NDalicPINVOKE.ScrollView_Property_AXIS_AUTO_LOCK_ENABLED_get(); @@ -516,19 +341,8 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ScrollView(ScrollView handle) : this(NDalicPINVOKE.new_ScrollView__SWIG_1(ScrollView.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ScrollView Assign(ScrollView handle) - { - ScrollView ret = new ScrollView(NDalicPINVOKE.ScrollView_Assign(swigCPtr, ScrollView.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - public new static ScrollView DownCast(BaseHandle handle) + internal new static ScrollView DownCast(BaseHandle handle) { ScrollView ret = new ScrollView(NDalicPINVOKE.ScrollView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -828,12 +642,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public void RemoveConstraintsFromChildren() - { - NDalicPINVOKE.ScrollView_RemoveConstraintsFromChildren(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public void ApplyEffect(ScrollViewEffect effect) { NDalicPINVOKE.ScrollView_ApplyEffect(swigCPtr, ScrollViewEffect.getCPtr(effect)); @@ -889,20 +697,12 @@ namespace Tizen.NUI return ret; } - public enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000, - ANIMATABLE_PROPERTY_START_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX, - ANIMATABLE_PROPERTY_END_INDEX = PropertyRanges.ANIMATABLE_PROPERTY_REGISTRATION_START_INDEX + 1000 - } - public bool WrapEnabled { get { bool temp = false; - GetProperty(ScrollView.Property.WRAP_ENABLED).Get(ref temp); + GetProperty(ScrollView.Property.WRAP_ENABLED).Get(out temp); return temp; } set @@ -915,7 +715,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(ScrollView.Property.PANNING_ENABLED).Get(ref temp); + GetProperty(ScrollView.Property.PANNING_ENABLED).Get(out temp); return temp; } set @@ -928,7 +728,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(ScrollView.Property.AXIS_AUTO_LOCK_ENABLED).Get(ref temp); + GetProperty(ScrollView.Property.AXIS_AUTO_LOCK_ENABLED).Get(out temp); return temp; } set @@ -993,7 +793,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ScrollView.Property.OVERSHOOT_X).Get(ref temp); + GetProperty(ScrollView.Property.OVERSHOOT_X).Get(out temp); return temp; } set @@ -1006,7 +806,7 @@ namespace Tizen.NUI get { float temp = 0.0f; - GetProperty(ScrollView.Property.OVERSHOOT_Y).Get(ref temp); + GetProperty(ScrollView.Property.OVERSHOOT_Y).Get(out temp); return temp; } set @@ -1032,7 +832,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(ScrollView.Property.WRAP).Get(ref temp); + GetProperty(ScrollView.Property.WRAP).Get(out temp); return temp; } set @@ -1045,7 +845,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(ScrollView.Property.PANNING).Get(ref temp); + GetProperty(ScrollView.Property.PANNING).Get(out temp); return temp; } set @@ -1058,7 +858,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(ScrollView.Property.SCROLLING).Get(ref temp); + GetProperty(ScrollView.Property.SCROLLING).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs index 034f03e..0f430ba 100755 --- a/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs +++ b/src/Tizen.NUI/src/public/UIComponents/ToggleButton.cs @@ -62,7 +62,7 @@ namespace Tizen.NUI //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -78,97 +78,11 @@ namespace Tizen.NUI base.Dispose(type); } - public class Property : global::System.IDisposable + public class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - - ~Property() - { - if (!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if (type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_ToggleButton_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - - disposed = true; - } - - public Property() : this(NDalicPINVOKE.new_ToggleButton_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public static readonly int STATE_VISUALS = NDalicPINVOKE.ToggleButton_Property_STATE_VISUALS_get(); public static readonly int TOOLTIPS = NDalicPINVOKE.ToggleButton_Property_TOOLTIPS_get(); public static readonly int CURRENT_STATE_INDEX = NDalicPINVOKE.ToggleButton_Property_CURRENT_STATE_INDEX_get(); - } public ToggleButton() : this(NDalicPINVOKE.ToggleButton_New(), true) @@ -176,31 +90,14 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ToggleButton(ToggleButton toggleButton) : this(NDalicPINVOKE.new_ToggleButton__SWIG_1(ToggleButton.getCPtr(toggleButton)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - public ToggleButton Assign(ToggleButton toggleButton) - { - ToggleButton ret = new ToggleButton(NDalicPINVOKE.ToggleButton_Assign(swigCPtr, ToggleButton.getCPtr(toggleButton)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ToggleButton DownCast(BaseHandle handle) + internal new static ToggleButton DownCast(BaseHandle handle) { ToggleButton ret = new ToggleButton(NDalicPINVOKE.ToggleButton_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - public enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX, - PROPERTY_END_INDEX = View.PropertyRange.PROPERTY_START_INDEX + 1000 - } - public Tizen.NUI.PropertyArray StateVisuals { get @@ -232,7 +129,7 @@ namespace Tizen.NUI get { int temp = 0; - GetProperty(ToggleButton.Property.CURRENT_STATE_INDEX).Get(ref temp); + GetProperty(ToggleButton.Property.CURRENT_STATE_INDEX).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/public/Vector2.cs b/src/Tizen.NUI/src/public/Vector2.cs index 1c9d79e..fa80264 100755 --- a/src/Tizen.NUI/src/public/Vector2.cs +++ b/src/Tizen.NUI/src/public/Vector2.cs @@ -320,133 +320,112 @@ namespace Tizen.NUI } } - internal Vector2 Assign(float[] array) - { - Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_0(swigCPtr, array), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector2 Assign(Vector3 rhs) - { - Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_1(swigCPtr, Vector3.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector2 Assign(Vector4 rhs) - { - Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector2 Add(Vector2 rhs) + private Vector2 Add(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Add(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 AddAssign(Vector2 rhs) + private Vector2 AddAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_AddAssign(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 Subtract(Vector2 rhs) + private Vector2 Subtract(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 SubtractAssign(Vector2 rhs) + private Vector2 SubtractAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_SubtractAssign(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 Multiply(Vector2 rhs) + private Vector2 Multiply(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 Multiply(float rhs) + private Vector2 Multiply(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Multiply__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 MultiplyAssign(Vector2 rhs) + private Vector2 MultiplyAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 MultiplyAssign(float rhs) + private Vector2 MultiplyAssign(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_MultiplyAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 Divide(Vector2 rhs) + private Vector2 Divide(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 Divide(float rhs) + private Vector2 Divide(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Divide__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 DivideAssign(Vector2 rhs) + private Vector2 DivideAssign(Vector2 rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_0(swigCPtr, Vector2.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 DivideAssign(float rhs) + private Vector2 DivideAssign(float rhs) { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_DivideAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector2 Subtract() + private Vector2 Subtract() { Vector2 ret = new Vector2(NDalicPINVOKE.Vector2_Subtract__SWIG_1(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool EqualTo(Vector2 rhs) + private bool EqualTo(Vector2 rhs) { bool ret = NDalicPINVOKE.Vector2_EqualTo(swigCPtr, Vector2.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool NotEqualTo(Vector2 rhs) + private bool NotEqualTo(Vector2 rhs) { bool ret = NDalicPINVOKE.Vector2_NotEqualTo(swigCPtr, Vector2.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal float ValueOfIndex(uint index) + private float ValueOfIndex(uint index) { float ret = NDalicPINVOKE.Vector2_ValueOfIndex__SWIG_0(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Vector3.cs b/src/Tizen.NUI/src/public/Vector3.cs index 62f282c..4c54bd1 100755 --- a/src/Tizen.NUI/src/public/Vector3.cs +++ b/src/Tizen.NUI/src/public/Vector3.cs @@ -349,140 +349,119 @@ namespace Tizen.NUI } } - internal Vector3 Assign(float[] array) - { - Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_0(swigCPtr, array), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector3 Assign(Vector2 rhs) - { - Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector3 Assign(Vector4 rhs) - { - Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Assign__SWIG_2(swigCPtr, Vector4.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector3 Add(Vector3 rhs) + private Vector3 Add(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Add(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 AddAssign(Vector3 rhs) + private Vector3 AddAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_AddAssign(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 Subtract(Vector3 rhs) + private Vector3 Subtract(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 SubtractAssign(Vector3 rhs) + private Vector3 SubtractAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_SubtractAssign(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 Multiply(Vector3 rhs) + private Vector3 Multiply(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 Multiply(float rhs) + private Vector3 Multiply(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 MultiplyAssign(Vector3 rhs) + private Vector3 MultiplyAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 MultiplyAssign(float rhs) + private Vector3 MultiplyAssign(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 MultiplyAssign(Rotation rhs) + private Vector3 MultiplyAssign(Rotation rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_MultiplyAssign__SWIG_2(swigCPtr, Rotation.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 Divide(Vector3 rhs) + private Vector3 Divide(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 Divide(float rhs) + private Vector3 Divide(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 DivideAssign(Vector3 rhs) + private Vector3 DivideAssign(Vector3 rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_0(swigCPtr, Vector3.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 DivideAssign(float rhs) + private Vector3 DivideAssign(float rhs) { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_DivideAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector3 Subtract() + private Vector3 Subtract() { Vector3 ret = new Vector3(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool EqualTo(Vector3 rhs) + private bool EqualTo(Vector3 rhs) { bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Vector3.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool NotEqualTo(Vector3 rhs) + private bool NotEqualTo(Vector3 rhs) { bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Vector3.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal float ValueOfIndex(uint index) + private float ValueOfIndex(uint index) { float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/Vector4.cs b/src/Tizen.NUI/src/public/Vector4.cs index fb80a29..d57ccd6 100755 --- a/src/Tizen.NUI/src/public/Vector4.cs +++ b/src/Tizen.NUI/src/public/Vector4.cs @@ -308,133 +308,112 @@ namespace Tizen.NUI } } - internal Vector4 Assign(float[] array) - { - Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_0(swigCPtr, array), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector4 Assign(Vector2 vec2) - { - Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_1(swigCPtr, Vector2.getCPtr(vec2)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector4 Assign(Vector3 vec3) - { - Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Assign__SWIG_2(swigCPtr, Vector3.getCPtr(vec3)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - internal Vector4 Add(Vector4 rhs) + private Vector4 Add(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Add(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 AddAssign(Vector4 rhs) + private Vector4 AddAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_AddAssign(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 Subtract(Vector4 rhs) + private Vector4 Subtract(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 SubtractAssign(Vector4 rhs) + private Vector4 SubtractAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_SubtractAssign(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 Multiply(Vector4 rhs) + private Vector4 Multiply(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 Multiply(float rhs) + private Vector4 Multiply(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Multiply__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 MultiplyAssign(Vector4 rhs) + private Vector4 MultiplyAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 MultiplyAssign(float rhs) + private Vector4 MultiplyAssign(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_MultiplyAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 Divide(Vector4 rhs) + private Vector4 Divide(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 Divide(float rhs) + private Vector4 Divide(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Divide__SWIG_1(swigCPtr, rhs), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 DivideAssign(Vector4 rhs) + private Vector4 DivideAssign(Vector4 rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_0(swigCPtr, Vector4.getCPtr(rhs)), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 DivideAssign(float rhs) + private Vector4 DivideAssign(float rhs) { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_DivideAssign__SWIG_1(swigCPtr, rhs), false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal Vector4 Subtract() + private Vector4 Subtract() { Vector4 ret = new Vector4(NDalicPINVOKE.Vector4_Subtract__SWIG_1(swigCPtr), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool EqualTo(Vector4 rhs) + private bool EqualTo(Vector4 rhs) { bool ret = NDalicPINVOKE.Vector4_EqualTo(swigCPtr, Vector4.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal bool NotEqualTo(Vector4 rhs) + private bool NotEqualTo(Vector4 rhs) { bool ret = NDalicPINVOKE.Vector4_NotEqualTo(swigCPtr, Vector4.getCPtr(rhs)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; } - internal float ValueOfIndex(uint index) + private float ValueOfIndex(uint index) { float ret = NDalicPINVOKE.Vector4_ValueOfIndex__SWIG_0(swigCPtr, index); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/VideoView.cs b/src/Tizen.NUI/src/public/VideoView.cs index 7ec231e..af52689 100755 --- a/src/Tizen.NUI/src/public/VideoView.cs +++ b/src/Tizen.NUI/src/public/VideoView.cs @@ -30,7 +30,7 @@ namespace Tizen.NUI using System; using System.Runtime.InteropServices; using Tizen.NUI.BaseComponents; - + /// /// VideoView is a control for video playback and display. /// @@ -160,97 +160,12 @@ namespace Tizen.NUI } - internal class Property : global::System.IDisposable + internal class Property { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Property(global::System.IntPtr cPtr, bool cMemoryOwn) - { - swigCMemOwn = cMemoryOwn; - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - } - - internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Property obj) - { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - //NUI Dispose Pattern written by Jinwoo Nam(jjw.nam) - - //A Flag to check who called Dispose(). (By User or DisposeQueue) - private bool isDisposeQueued = false; - //A Flat to check if it is already disposed. - protected bool disposed = false; - - ~Property() - { - if(!isDisposeQueued) - { - isDisposeQueued = true; - DisposeQueue.Instance.Add(this); - } - } - - public void Dispose() - { - //Throw excpetion if Dispose() is called in separate thread. - if (!Window.IsInstalled()) - { - throw new System.InvalidOperationException("This API called from separate thread. This API must be called from MainThread."); - } - - if (isDisposeQueued) - { - Dispose(DisposeTypes.Implicit); - } - else - { - Dispose(DisposeTypes.Explicit); - System.GC.SuppressFinalize(this); - } - } - - protected virtual void Dispose(DisposeTypes type) - { - if (disposed) - { - return; - } - - if(type == DisposeTypes.Explicit) - { - //Called by User - //Release your own managed resources here. - //You should release all of your own disposable objects here. - } - - //Release your own unmanaged resources here. - //You should not access any managed member here except static instance. - //because the execution order of Finalizes is non-deterministic. - - if (swigCPtr.Handle != global::System.IntPtr.Zero) - { - if (swigCMemOwn) - { - swigCMemOwn = false; - NDalicPINVOKE.delete_VideoView_Property(swigCPtr); - } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - disposed = true; - } - - internal Property() : this(NDalicPINVOKE.new_VideoView_Property(), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - internal static readonly int VIDEO = NDalicPINVOKE.VideoView_Property_VIDEO_get(); internal static readonly int LOOPING = NDalicPINVOKE.VideoView_Property_LOOPING_get(); internal static readonly int MUTED = NDalicPINVOKE.VideoView_Property_MUTED_get(); internal static readonly int VOLUME = NDalicPINVOKE.VideoView_Property_VOLUME_get(); - } /// @@ -277,13 +192,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal VideoView Assign(VideoView videoView) - { - VideoView ret = new VideoView(NDalicPINVOKE.VideoView_Assign(swigCPtr, VideoView.getCPtr(videoView)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// Downcasts a handle to VideoView handle.
/// If handle points to a VideoView, the downcast produces valid handle.
@@ -291,7 +199,7 @@ namespace Tizen.NUI /// /// Handle to an object /// Handle to a VideoView or an uninitialized handle - public new static VideoView DownCast(BaseHandle handle) + internal new static VideoView DownCast(BaseHandle handle) { VideoView ret = new VideoView(NDalicPINVOKE.VideoView_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -352,11 +260,6 @@ namespace Tizen.NUI return ret; } - internal enum PropertyRange - { - PROPERTY_START_INDEX = PropertyRanges.PROPERTY_REGISTRATION_START_INDEX - } - /// /// video file url as string type or PropertyMap. /// @@ -382,7 +285,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(VideoView.Property.LOOPING).Get(ref temp); + GetProperty(VideoView.Property.LOOPING).Get(out temp); return temp; } set @@ -399,7 +302,7 @@ namespace Tizen.NUI get { bool temp = false; - GetProperty(VideoView.Property.MUTED).Get(ref temp); + GetProperty(VideoView.Property.MUTED).Get(out temp); return temp; } set diff --git a/src/Tizen.NUI/src/internal/ViewWrapper.cs b/src/Tizen.NUI/src/public/ViewWrapper.cs similarity index 82% rename from src/Tizen.NUI/src/internal/ViewWrapper.cs rename to src/Tizen.NUI/src/public/ViewWrapper.cs index 8293e87..978da1a 100755 --- a/src/Tizen.NUI/src/internal/ViewWrapper.cs +++ b/src/Tizen.NUI/src/public/ViewWrapper.cs @@ -55,7 +55,7 @@ namespace Tizen.NUI //You should not access any managed member here except static instance. //because the execution order of Finalizes is non-deterministic. - //Unreference this from if a static instance refer to this. + //Unreference this from if a static instance refer to this. ViewRegistry.UnregisterView(this); if (swigCPtr.Handle != global::System.IntPtr.Zero) @@ -78,19 +78,7 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - public ViewWrapper(ViewWrapper handle) : this(NDalicManualPINVOKE.new_ViewWrapper__SWIG_1(ViewWrapper.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - public ViewWrapper Assign(ViewWrapper handle) - { - ViewWrapper ret = new ViewWrapper(NDalicManualPINVOKE.ViewWrapper_Assign(swigCPtr, ViewWrapper.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - public new static ViewWrapper DownCast(BaseHandle handle) + internal new static ViewWrapper DownCast(BaseHandle handle) { ViewWrapper ret = new ViewWrapper(NDalicManualPINVOKE.ViewWrapper_DownCast(BaseHandle.getCPtr(handle)), true); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/src/Tizen.NUI/src/public/VisualBase.cs b/src/Tizen.NUI/src/public/VisualBase.cs index aaa7c49..35d9694 100755 --- a/src/Tizen.NUI/src/public/VisualBase.cs +++ b/src/Tizen.NUI/src/public/VisualBase.cs @@ -74,13 +74,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal VisualBase Assign(VisualBase handle) - { - VisualBase ret = new VisualBase(NDalicPINVOKE.VisualBase_Assign(swigCPtr, VisualBase.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - /// /// name of the visual /// diff --git a/src/Tizen.NUI/src/public/VisualFactory.cs b/src/Tizen.NUI/src/public/VisualFactory.cs index 545b368..6fb8c3e 100755 --- a/src/Tizen.NUI/src/public/VisualFactory.cs +++ b/src/Tizen.NUI/src/public/VisualFactory.cs @@ -76,17 +76,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal VisualFactory(VisualFactory handle) : this(NDalicPINVOKE.new_VisualFactory__SWIG_1(VisualFactory.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal VisualFactory Assign(VisualFactory handle) - { - VisualFactory ret = new VisualFactory(NDalicPINVOKE.VisualFactory_Assign(swigCPtr, VisualFactory.getCPtr(handle)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } /// /// Request the visual @@ -107,12 +96,6 @@ namespace Tizen.NUI return ret; } - internal VisualBase CreateVisual(string url, Uint16Pair size) - { - VisualBase ret = new VisualBase(NDalicPINVOKE.VisualFactory_CreateVisual__SWIG_2(swigCPtr, url, Uint16Pair.getCPtr(size)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } private static readonly VisualFactory instance = VisualFactory.Get(); /// diff --git a/src/Tizen.NUI/src/public/Window.cs b/src/Tizen.NUI/src/public/Window.cs index d9913a0..facdbb0 100755 --- a/src/Tizen.NUI/src/public/Window.cs +++ b/src/Tizen.NUI/src/public/Window.cs @@ -106,7 +106,7 @@ namespace Tizen.NUI /// /// Sets the focus acceptable flag of an window as true. /// - public void SetAcceptFocus(bool accept) + internal void SetAcceptFocus(bool accept) { NDalicPINVOKE.SetAcceptFocus(swigCPtr, accept); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -115,7 +115,7 @@ namespace Tizen.NUI /// /// Retrieves whether the window is focus acceptable or not. /// - public bool IsFocusAcceptable() + internal bool IsFocusAcceptable() { return NDalicPINVOKE.IsFocusAcceptable(swigCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -254,15 +254,6 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } } - // public void SetType(WindowType type) { - - // } - - // public WindowType GetType() { - // WindowType ret = (WindowType)NDalicPINVOKE.GetType(swigCPtr); - // if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - // return ret; - // } /// /// Sets a priority level for the specified notification window. @@ -422,25 +413,13 @@ namespace Tizen.NUI if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal Window(Window handle) : this(NDalicPINVOKE.new_Window__SWIG_1(Window.getCPtr(handle)), true) - { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - internal Window Assign(Window rhs) - { - Window ret = new Window(NDalicPINVOKE.Window_Assign(swigCPtr, Window.getCPtr(rhs)), false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - internal void ShowIndicator(Window.IndicatorVisibleMode visibleMode) { NDalicPINVOKE.Window_ShowIndicator(swigCPtr, (int)visibleMode); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } - internal void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity) + internal void SetIndicatorBackgroundOpacity(Window.IndicatorBackgroundOpacity opacity) { NDalicPINVOKE.Window_SetIndicatorBgOpacity(swigCPtr, (int)opacity); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -544,7 +523,7 @@ namespace Tizen.NUI /// Add layer to the Stage. /// /// Layer to add - public void AddLayer(Layer layer) + public void Add(Layer layer) { NDalicPINVOKE.Stage_Add(stageCPtr, Layer.getCPtr(layer)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -554,7 +533,7 @@ namespace Tizen.NUI /// Remove layer from the Stage. /// /// Layer to remove - public void RemoveLayer(Layer layer) + public void Remove(Layer layer) { NDalicPINVOKE.Stage_Remove(stageCPtr, Layer.getCPtr(layer)); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -591,7 +570,7 @@ namespace Tizen.NUI /// /// The number of layers. /// Note that a default layer is always provided (count >= 1). - public uint GetLayerCount() + internal uint GetLayerCount() { uint ret = NDalicPINVOKE.Stage_GetLayerCount(stageCPtr); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -835,7 +814,7 @@ namespace Tizen.NUI /// /// Enumeration for opacity of the indicator. /// - internal enum IndicatorBgOpacity + internal enum IndicatorBackgroundOpacity { Opaque = 100, Translucent = 50, @@ -884,7 +863,7 @@ namespace Tizen.NUI /// then when the last finger is lifted.
/// An interrupted event will also be emitted (if it occurs).
/// - public event EventHandler TouchEvent + public event EventHandler Touched { add { @@ -952,7 +931,7 @@ namespace Tizen.NUI /// /// Event emitted when wheel event is received. /// - public event EventHandler WheelEvent + public event EventHandler WheelRolled { add { -- 2.7.4