From 34ab851e477941938cb2a2d9fa5ba26f06792597 Mon Sep 17 00:00:00 2001 From: Adeel Kazmi Date: Fri, 23 Jun 2017 13:05:53 +0100 Subject: [PATCH] Change PositionUsesAnchorPoint property to PositionUsesPivotPoint Change-Id: Ie977eb336f07eae439df4a3da38afbac36280f45 --- .../NUISample2.Tizen/NUISample2.Tizen.cs | 24 ++++++---- .../NUISamples.TizenTV/NUISamples.TizenTV.csproj | 2 +- .../NUISamples/NUISamples.TizenTV/examples/Main.cs | 2 +- .../NUISamples.TizenTV/examples/custom-control.cs | 2 - .../NUISamples.TizenTV/examples/date-picker.cs | 6 --- .../NUISamples.TizenTV/examples/gc-test.cs | 11 ----- .../NUISamples.TizenTV/examples/image-view.cs | 6 +-- ...oint-test.cs => positionUsesPivotPoint-test.cs} | 10 ++-- .../NUISamples.TizenTV/examples/visuals-example.cs | 3 -- .../NUISamples.TizenTV/firstscreen/App.cs | 28 ++++++----- .../NUISamples.TizenTV/firstscreen/FocusData.cs | 3 +- .../firstscreen/ScrollContainer.cs | 5 +- .../res/json/date-picker-template.json | 11 +---- Tizen.NUI/src/internal/Alignment.cs | 2 - Tizen.NUI/src/internal/GaussianBlurView.cs | 2 - Tizen.NUI/src/internal/Model3dView.cs | 2 - Tizen.NUI/src/internal/PageTurnView.cs | 2 - Tizen.NUI/src/internal/Slider.cs | 2 - Tizen.NUI/src/public/BaseComponents/CustomView.cs | 3 -- Tizen.NUI/src/public/BaseComponents/ImageView.cs | 2 - Tizen.NUI/src/public/BaseComponents/TextEditor.cs | 2 - Tizen.NUI/src/public/BaseComponents/TextField.cs | 2 - Tizen.NUI/src/public/BaseComponents/TextLabel.cs | 2 - Tizen.NUI/src/public/BaseComponents/View.cs | 14 +++--- Tizen.NUI/src/public/FlexContainer.cs | 2 - Tizen.NUI/src/public/NUIConstants.cs | 2 +- Tizen.NUI/src/public/Position.cs | 56 +++++++++++----------- Tizen.NUI/src/public/ProgressBar.cs | 2 - Tizen.NUI/src/public/Scrollable.cs | 4 +- Tizen.NUI/src/public/TableView.cs | 2 - Tizen.NUI/src/public/UIComponents/Button.cs | 2 - Tizen.NUI/src/public/UIComponents/Popup.cs | 2 - Tizen.NUI/src/public/UIComponents/ScrollBar.cs | 2 - Tizen.NUI/src/public/VideoView.cs | 2 - Tizen.NUI/src/public/ViewWrapper.cs | 2 - 35 files changed, 84 insertions(+), 142 deletions(-) rename NUISamples/NUISamples/NUISamples.TizenTV/examples/{positionUsesAnchorPoint-test.cs => positionUsesPivotPoint-test.cs} (91%) diff --git a/NUISample2/NUISample2/NUISample2.Tizen/NUISample2.Tizen.cs b/NUISample2/NUISample2/NUISample2.Tizen/NUISample2.Tizen.cs index e84a93a..536e502 100755 --- a/NUISample2/NUISample2/NUISample2.Tizen/NUISample2.Tizen.cs +++ b/NUISample2/NUISample2/NUISample2.Tizen/NUISample2.Tizen.cs @@ -87,7 +87,8 @@ namespace ControlDashboard TextLabel topLabel = new TextLabel(); topLabel.WidthResizePolicy = ResizePolicyType.FillToParent; topLabel.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent; - topLabel.AnchorPoint = AnchorPoint.TopCenter; + topLabel.PivotPoint = PivotPoint.TopCenter; + topLabel.PositionUsesPivotPoint = true; topLabel.ParentOrigin = ParentOrigin.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); @@ -105,7 +106,8 @@ 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 = PivotPoint.BottomCenter; + _contentContainer.PositionUsesPivotPoint = true; _contentContainer.ParentOrigin = ParentOrigin.BottomCenter; _contentContainer.SetRelativeHeight(0, 0.07f); _contentContainer.SetRelativeHeight(1, 0.26f); @@ -329,7 +331,8 @@ namespace ControlDashboard PushButton button = new PushButton(); button.LabelText = "Popup"; button.ParentOrigin = ParentOrigin.Center; - button.AnchorPoint = AnchorPoint.Center; + button.PivotPoint = PivotPoint.Center; + button.PositionUsesPivotPoint = true; button.MaximumSize = new Size2D(150, 100); _popup = CreatePopup(); _popup.SetTitle(CreateTitle("Popup")); @@ -358,7 +361,8 @@ namespace ControlDashboard PushButton button = new PushButton(); button.LabelText = "Toast"; button.ParentOrigin = ParentOrigin.Center; - button.AnchorPoint = AnchorPoint.Center; + button.PivotPoint = PivotPoint.Center; + button.PositionUsesPivotPoint = true; button.Clicked += (obj, ee) => { TypeInfo typeInfo = new TypeInfo(TypeRegistry.Get().GetTypeInfo("PopupToast")); @@ -404,25 +408,29 @@ namespace ControlDashboard footer.HeightResizePolicy = ResizePolicyType.Fixed; footer.Size = new Size(0.0f, 80.0f, 0.0f); footer.ParentOrigin = ParentOrigin.Center; - footer.AnchorPoint = AnchorPoint.Center; + footer.PivotPoint = PivotPoint.Center; + footer.PositionUsesPivotPoint = true; PushButton okButton = CreateOKButton(); okButton.ParentOrigin = ParentOrigin.Center; - okButton.AnchorPoint = AnchorPoint.Center; + okButton.PivotPoint = PivotPoint.Center; + okButton.PositionUsesPivotPoint = true; okButton.WidthResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; okButton.HeightResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; okButton.SetSizeModeFactor(new Vector3(-20.0f, -20.0f, 0.0f)); PushButton cancelButton = CreateCancelButton(); cancelButton.ParentOrigin = ParentOrigin.Center; - cancelButton.AnchorPoint = AnchorPoint.Center; + cancelButton.PivotPoint = PivotPoint.Center; + cancelButton.PositionUsesPivotPoint = true; 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.ParentOrigin = ParentOrigin.Center; - controlLayout.AnchorPoint = AnchorPoint.Center; + controlLayout.PivotPoint = PivotPoint.Center; + controlLayout.PositionUsesPivotPoint = true; controlLayout.WidthResizePolicy = ResizePolicyType.FillToParent; controlLayout.HeightResizePolicy = ResizePolicyType.FillToParent; controlLayout.SetCellPadding(new Size2D(10, 10)); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj b/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj index db68db3..2442cfc 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj +++ b/NUISamples/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj @@ -67,7 +67,7 @@ - + diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs index 78fd748..fbfe45f 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs @@ -37,7 +37,7 @@ namespace NUISamples.TizenTV.examples //new VisualViewTest3.Example().Run(args); //o //new VisualsUsingCustomView.VisualsExample().Run(args); //o //new FirstScreen.FirstScreenApp().Run(args); //o - //new PositionUsesAnchorPointTest.Example().Run(args); + //new PositionUsesPivotPointTest.Example().Run(args); // new VisualsExampleTest.Example().Run(args); //o //new TizenSTVUIApplication15.Program().Run(args); } diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs index 0a37c07..34e4e76 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs @@ -58,8 +58,6 @@ namespace CustomControlTest // Create a container for the star images _container = new FlexContainer(); - //_container.ParentOrigin = ParentOrigin.TopLeft; - //_container.AnchorPoint = AnchorPoint.TopLeft; _container.FlexDirection = FlexContainer.FlexDirectionType.Row; _container.WidthResizePolicy = ResizePolicyType.FillToParent; _container.HeightResizePolicy = ResizePolicyType.FillToParent; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs index b707ca2..17ebef7 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs @@ -52,17 +52,13 @@ namespace DatePickerTest // Create a container for the spins _container = new FlexContainer(); - //_container.ParentOrigin = ParentOrigin.Center; - _container.PivotPoint = PivotPoint.Center; _container.FlexDirection = FlexContainer.FlexDirectionType.Row; _container.Size = new Vector3(480.0f, 150.0f, 0.0f); - _container.Position2D = new Position2D(400, 400); window.Add(_container); // Create a Spin control for year _spinYear = new Spin(); - _spinYear.PivotPoint = PivotPoint.Center; _spinYear.Flex = 0.3f; _spinYear.FlexMargin = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); _container.Add(_spinYear); @@ -79,7 +75,6 @@ namespace DatePickerTest // Create a Spin control for month _spinMonth = new Spin(); - _spinMonth.PivotPoint = PivotPoint.Center; _spinMonth.Flex = 0.3f; _spinMonth.FlexMargin = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); _container.Add(_spinMonth); @@ -96,7 +91,6 @@ namespace DatePickerTest // Create a Spin control for day _spinDay = new Spin(); - _spinDay.PivotPoint = PivotPoint.Center; _spinDay.Flex = 0.3f; _spinDay.FlexMargin = new Vector4(5.0f, 0.0f, 5.0f, 0.0f); _container.Add(_spinDay); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs index a2e21d8..6248758 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs @@ -34,7 +34,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); myViewList.Add(v); @@ -71,7 +70,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); v.Text = "label " + i; @@ -87,7 +85,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); v.LabelText = "button " + i; @@ -103,7 +100,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); v.ResourceUrl = resources + "/images/gallery-3.jpg"; @@ -119,7 +115,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); v.Text = "editor" + i; @@ -135,7 +130,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); v.Text = "field " + i; @@ -151,7 +145,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); v.LabelText = "check " + i; @@ -167,7 +160,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); myViewList.Add(v); @@ -182,7 +174,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); myViewList.Add(v); @@ -197,7 +188,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); myViewList.Add(v); @@ -212,7 +202,6 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.AnchorPoint = AnchorPoint.TopLeft; v.Size = new Size(100, 100, 0); myViewList.Add(v); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs index 8f16634..900d415 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs @@ -115,7 +115,7 @@ namespace ImageViewTest ImageView syncImage = new ImageView(); syncImage.ParentOrigin = ParentOrigin.CenterLeft; syncImage.PivotPoint = PivotPoint.CenterLeft; - syncImage.PositionUsesAnchorPoint = true; + syncImage.PositionUsesPivotPoint = true; syncImage.Size2D = new Size2D(150, 150); syncImage.ResourceUrl = resources+"/images/gallery-3.jpg"; syncImage.SynchronosLoading = true; @@ -128,7 +128,7 @@ namespace ImageViewTest ImageView nPatchImage = new ImageView(); nPatchImage.ParentOrigin = ParentOrigin.BottomLeft; nPatchImage.PivotPoint = PivotPoint.BottomLeft; - nPatchImage.PositionUsesAnchorPoint = true; + nPatchImage.PositionUsesPivotPoint = true; nPatchImage.Size = new Size(300.0f, 100.0f, 0.0f); nPatchImage.ImageMap = _map; layer.Add(nPatchImage); @@ -137,7 +137,7 @@ namespace ImageViewTest syncNineImage.ParentOrigin = ParentOrigin.CenterLeft; syncNineImage.PivotPoint = PivotPoint.CenterLeft; syncNineImage.Position2D = new Position2D(0, 200); - syncNineImage.PositionUsesAnchorPoint = true; + syncNineImage.PositionUsesPivotPoint = true; syncNineImage.Size = new Size(150.0f, 150.0f, 0.0f); syncNineImage.ResourceUrl = resources+"/images/00_popup_bg.9.png"; syncNineImage.SynchronosLoading = true; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesPivotPoint-test.cs similarity index 91% rename from NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs rename to NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesPivotPoint-test.cs index 9046852..d2088a2 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesAnchorPoint-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/positionUsesPivotPoint-test.cs @@ -29,7 +29,7 @@ using Tizen.NUI.Constants; // This file can only run on Tizen target. You should compile it with DaliApplication.cs, and // add tizen c# application related library as reference. //------------------------------------------------------------------------------ -namespace PositionUsesAnchorPointTest +namespace PositionUsesPivotPointTest { class Example : NUIApplication { @@ -59,22 +59,22 @@ namespace PositionUsesAnchorPointTest { // Connect the signal callback for window touched signal _window = Window.Instance; - _text1 = new TextLabel("PositionUsesAnchorPoint"); + _text1 = new TextLabel("PositionUsesPivotPoint"); _text1.ParentOrigin = ParentOrigin.Center; _text1.PivotPoint = PivotPoint.Center; _text1.Position = new Position(0, 0, 0); - _text1.PositionUsesAnchorPoint = true; + _text1.PositionUsesPivotPoint = true; _text1.HorizontalAlignment = HorizontalAlignment.Center; _text1.Size2D = new Size2D(200, 100); _text1.PointSize = 10.0f; _text1.BackgroundColor = Color.Blue; _window.Add(_text1); - _text2 = new TextLabel("PositionNotUsesAnchorPoint"); + _text2 = new TextLabel("PositionNotUsesPivotPoint"); _text2.ParentOrigin = ParentOrigin.Center; _text2.PivotPoint = PivotPoint.Center; _text2.Position = new Position(0, 0, 0); - _text2.PositionUsesAnchorPoint = false; + _text2.PositionUsesPivotPoint = false; _text2.HorizontalAlignment = HorizontalAlignment.Center; _text2.Size2D = new Size2D(200, 100); _text2.PointSize = 10.0f; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs index 705c115..b20ffc5 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs @@ -54,9 +54,6 @@ namespace VisualsExampleTest contentLayout.Name = ("ContentLayout"); contentLayout.WidthResizePolicy = ResizePolicyType.FillToParent; contentLayout.HeightResizePolicy = ResizePolicyType.FillToParent; - //contentLayout.ParentOrigin = ParentOrigin.Center; - //contentLayout.AnchorPoint = AnchorPoint.Center; - // contentLayout.Size = new Size(window.Size.Width, window.Size.Height, 0.0f); contentLayout.SetCellPadding(new Size2D(0, 5)); contentLayout.BackgroundColor = Color.Red;//new Color(0.949f, 0.949f, 0.949f, 1.0f); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs index 0b2bf00..1d849c8 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/App.cs @@ -268,7 +268,6 @@ namespace FirstScreen _topContainer.Size = new Size(_stageSize.Width, _stageSize.Height * Constants.TopContainerHeightFactor, 0); _topContainer.Position = new Position(0.0f, _stageSize.Height * Constants.TopContainerPositionFactor, 0.0f); _topContainer.ParentOrigin = ParentOrigin.TopLeft; - _topContainer.AnchorPoint = AnchorPoint.TopLeft; // Add a background to Top container PropertyMap visual = new PropertyMap(); @@ -282,7 +281,6 @@ namespace FirstScreen _bottomContainer.Size = new Size(_stageSize.Width, _stageSize.Height * Constants.BottomContainerHeightFactor, 0); _bottomContainer.Position = new Position(0.0f, _stageSize.Height * Constants.BottomContainerHidePositionFactor, 0.0f); _bottomContainer.ParentOrigin = ParentOrigin.TopLeft; - _bottomContainer.AnchorPoint = AnchorPoint.TopLeft; // Add a background to Bottom Container visual = new PropertyMap(); @@ -297,7 +295,6 @@ namespace FirstScreen // Add a clip layer to Top Container _topClipLayer = new Layer(); - _topClipLayer.AnchorPoint = AnchorPoint.BottomCenter; _topClipLayer.ParentOrigin = ParentOrigin.BottomCenter; _topClipLayer.ClippingEnable = true; _topClipLayer.ClippingBox = new Rectangle(0, @@ -311,13 +308,15 @@ namespace FirstScreen spotLight.WidthResizePolicy = ResizePolicyType.UseNaturalSize; spotLight.HeightResizePolicy = ResizePolicyType.UseNaturalSize; spotLight.ParentOrigin = ParentOrigin.Center; - spotLight.AnchorPoint = AnchorPoint.Center; + spotLight.PivotPoint = PivotPoint.Center; + spotLight.PositionUsesPivotPoint = true; spotLight.Name = "spotLight"; // Create a shadowBorder for items / images of Poster ScrollContainers ImageView shadowBorder = new ImageView(_imagePath + "/focuseffect/thumbnail_shadow.9.png"); shadowBorder.ParentOrigin = ParentOrigin.Center; - shadowBorder.AnchorPoint = AnchorPoint.Center; + shadowBorder.PivotPoint = PivotPoint.Center; + shadowBorder.PositionUsesPivotPoint = true; shadowBorder.WidthResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; shadowBorder.HeightResizePolicy = ResizePolicyType.SizeFixedOffsetFromParent; shadowBorder.SizeModeFactor = (new Vector3(32.0f, 41.0f, 0.0f)); @@ -352,7 +351,8 @@ namespace FirstScreen // Add a clip layer to Bottom Container _bottomClipLayer = new Layer(); - _bottomClipLayer.AnchorPoint = AnchorPoint.BottomCenter; + _bottomClipLayer.PivotPoint = PivotPoint.BottomCenter; + _bottomClipLayer.PositionUsesPivotPoint = true; _bottomClipLayer.ParentOrigin = ParentOrigin.BottomCenter; _bottomClipLayer.ClippingEnable = true; _bottomClipLayer.ClippingBox = new Rectangle(Convert.ToInt32(Constants.LauncherWidth), @@ -370,7 +370,8 @@ namespace FirstScreen launcherIcon[launcherIndex].WidthResizePolicy = ResizePolicyType.UseNaturalSize; launcherIcon[launcherIndex].HeightResizePolicy = ResizePolicyType.UseNaturalSize; launcherIcon[launcherIndex].ParentOrigin = ParentOrigin.CenterLeft; - launcherIcon[launcherIndex].AnchorPoint = AnchorPoint.CenterLeft; + launcherIcon[launcherIndex].PivotPoint = PivotPoint.CenterLeft; + launcherIcon[launcherIndex].PositionUsesPivotPoint = true; launcherIcon[launcherIndex].Position = new Position(Constants.LauncherIconWidth * launcherIndex + Constants.LauncherLeftMargin, 0.0f, 0.0f); _bottomContainer.Add(launcherIcon[launcherIndex]); } @@ -381,7 +382,8 @@ namespace FirstScreen _launcherSeparator.WidthResizePolicy = ResizePolicyType.UseNaturalSize; _launcherSeparator.HeightResizePolicy = ResizePolicyType.FillToParent; _launcherSeparator.ParentOrigin = ParentOrigin.CenterLeft; - _launcherSeparator.AnchorPoint = AnchorPoint.CenterLeft; + _launcherSeparator.PivotPoint = PivotPoint.CenterLeft; + _launcherSeparator.PositionUsesPivotPoint = true; _launcherSeparator.Position = new Position(Constants.LauncherIconWidth * Constants.LauncherItemsCount + Constants.LauncherLeftMargin, 0.0f, 0.0f); _bottomContainer.Add(_launcherSeparator); @@ -401,8 +403,8 @@ namespace FirstScreen _menuContainer.ShadowBorder.Size = new Size(_menuContainer.ItemSize.Width + 40.0f, _menuContainer.ItemSize.Height + 50.0f, 0.0f); _menuContainer.ShadowBorder.Position = new Position(0.0f, 5.0f, 0.0f); _menuContainer.ShadowBorder.ParentOrigin = ParentOrigin.Center; - _menuContainer.ShadowBorder.AnchorPoint = AnchorPoint.Center; - //_menuContainer.ShadowBorder.MixColor = Color.Red; + _menuContainer.ShadowBorder.PivotPoint = PivotPoint.Center; + _menuContainer.ShadowBorder.PositionUsesPivotPoint = true; _menuContainer.SpotLight = spotLight; _bottomClipLayer.Add(_menuContainer); @@ -415,7 +417,8 @@ namespace FirstScreen _keyboardFocusIndicator = new ImageView(_imagePath + "/focuseffect/highlight_stroke.9.png"); _keyboardFocusIndicator.ParentOrigin = ParentOrigin.Center; - _keyboardFocusIndicator.AnchorPoint = AnchorPoint.Center; + _keyboardFocusIndicator.PivotPoint = PivotPoint.Center; + _keyboardFocusIndicator.PositionUsesPivotPoint = true; _keyboardFocusIndicator.WidthResizePolicy = ResizePolicyType.FillToParent; _keyboardFocusIndicator.HeightResizePolicy = ResizePolicyType.FillToParent; @@ -437,7 +440,8 @@ namespace FirstScreen TextLabel _dateOfTest = new TextLabel(); _dateOfTest.WidthResizePolicy = ResizePolicyType.FillToParent; _dateOfTest.HeightResizePolicy = ResizePolicyType.SizeRelativeToParent; - _dateOfTest.AnchorPoint = AnchorPoint.TopCenter; + _dateOfTest.PivotPoint = PivotPoint.TopCenter; + _dateOfTest.PositionUsesPivotPoint = true; _dateOfTest.ParentOrigin = ParentOrigin.TopCenter; _dateOfTest.SizeModeFactor = new Vector3(0.0f, 0.1f, 0.0f); _dateOfTest.BackgroundColor = new Color(43.0f / 255.0f, 145.0f / 255.0f, 175.0f / 255.0f, 1.0f); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs index 3a2c4e9..39ab573 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/FocusData.cs @@ -34,7 +34,8 @@ namespace FirstScreen _imageFocus = new ImageView(Constants.ImageResourcePath + "/focuseffect/" + _imageName); // Target _imageFocus.ParentOrigin = _parentOrigin; - _imageFocus.AnchorPoint = AnchorPoint.Center; + _imageFocus.PivotPoint = PivotPoint.Center; + _imageFocus.PositionUsesPivotPoint = true; _imageFocus.Name = _name; } diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs index 998e6ac..4faa23d 100644 --- a/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/firstscreen/ScrollContainer.cs @@ -256,13 +256,11 @@ namespace FirstScreen _itemList = new List(); this.ParentOrigin = Tizen.NUI.ParentOrigin.TopLeft; - this.AnchorPoint = Tizen.NUI.AnchorPoint.TopLeft; this.WidthResizePolicy = ResizePolicyType.FillToParent; this.HeightResizePolicy = ResizePolicyType.FillToParent; this.Focusable = (true); _container.ParentOrigin = Tizen.NUI.ParentOrigin.TopLeft; - _container.AnchorPoint = Tizen.NUI.AnchorPoint.TopLeft; _container.WidthResizePolicy = ResizePolicyType.FillToParent; _container.HeightResizePolicy = ResizePolicyType.FillToParent; @@ -288,7 +286,8 @@ namespace FirstScreen if (item is View && item != _container) { - item.AnchorPoint = Tizen.NUI.AnchorPoint.BottomCenter; + item.PivotPoint = Tizen.NUI.PivotPoint.BottomCenter; + item.PositionUsesPivotPoint = true; item.ParentOrigin = Tizen.NUI.ParentOrigin.BottomCenter; item.Size = _itemSize; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/res/json/date-picker-template.json b/NUISamples/NUISamples/NUISamples.TizenTV/res/json/date-picker-template.json index dd01d8f..79ab9a2 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/res/json/date-picker-template.json +++ b/NUISamples/NUISamples/NUISamples.TizenTV/res/json/date-picker-template.json @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 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. @@ -22,8 +22,6 @@ { "type":"FlexContainer", "name":"exampleDatePicker", - "parentOrigin": "CENTER", - "anchorPoint": "CENTER", "flexDirection":"ROW", "size":[480.0, 150, 0 ], "actors": [ @@ -31,8 +29,6 @@ "type": "Spin", "name": "Year", - "parentOrigin": "CENTER", - "anchorPoint": "CENTER", "Value":2017, "MinValue":1900, "MaxValue":2100, @@ -47,9 +43,6 @@ "type": "Spin", "name": "Month", - "parentOrigin": "CENTER", - "anchorPoint": "CENTER", - "parentOrigin": "CENTER", "Value":10, "Step":1, "MinValue":1, @@ -65,8 +58,6 @@ "type": "Spin", "name": "Day", - "parentOrigin": "CENTER", - "anchorPoint": "CENTER", "Value":1, "MinValue":1, "MaxValue":31, diff --git a/Tizen.NUI/src/internal/Alignment.cs b/Tizen.NUI/src/internal/Alignment.cs index e43fe34..5da5a92 100755 --- a/Tizen.NUI/src/internal/Alignment.cs +++ b/Tizen.NUI/src/internal/Alignment.cs @@ -36,8 +36,6 @@ namespace Tizen.NUI internal Alignment(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Alignment_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Alignment obj) diff --git a/Tizen.NUI/src/internal/GaussianBlurView.cs b/Tizen.NUI/src/internal/GaussianBlurView.cs index 4bde8c3..c2e77c5 100755 --- a/Tizen.NUI/src/internal/GaussianBlurView.cs +++ b/Tizen.NUI/src/internal/GaussianBlurView.cs @@ -40,8 +40,6 @@ namespace Tizen.NUI internal GaussianBlurView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.GaussianBlurView_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(GaussianBlurView obj) diff --git a/Tizen.NUI/src/internal/Model3dView.cs b/Tizen.NUI/src/internal/Model3dView.cs index 7c66870..cb6a581 100755 --- a/Tizen.NUI/src/internal/Model3dView.cs +++ b/Tizen.NUI/src/internal/Model3dView.cs @@ -36,8 +36,6 @@ namespace Tizen.NUI internal Model3dView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Model3dView_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Model3dView obj) diff --git a/Tizen.NUI/src/internal/PageTurnView.cs b/Tizen.NUI/src/internal/PageTurnView.cs index 61cbfd1..c94792a 100755 --- a/Tizen.NUI/src/internal/PageTurnView.cs +++ b/Tizen.NUI/src/internal/PageTurnView.cs @@ -22,8 +22,6 @@ namespace Tizen.NUI internal PageTurnView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.PageTurnView_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(PageTurnView obj) diff --git a/Tizen.NUI/src/internal/Slider.cs b/Tizen.NUI/src/internal/Slider.cs index fad752c..8df9be4 100755 --- a/Tizen.NUI/src/internal/Slider.cs +++ b/Tizen.NUI/src/internal/Slider.cs @@ -41,8 +41,6 @@ namespace Tizen.NUI.UIComponents internal Slider(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Slider_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Slider obj) diff --git a/Tizen.NUI/src/public/BaseComponents/CustomView.cs b/Tizen.NUI/src/public/BaseComponents/CustomView.cs index 5bfe0a6..3f2d165 100755 --- a/Tizen.NUI/src/public/BaseComponents/CustomView.cs +++ b/Tizen.NUI/src/public/BaseComponents/CustomView.cs @@ -64,9 +64,6 @@ namespace Tizen.NUI.BaseComponents viewWrapperImpl.OnTap = new ViewWrapperImpl.OnTapDelegate(OnTap); viewWrapperImpl.OnLongPress = new ViewWrapperImpl.OnLongPressDelegate(OnLongPress); - // By default, we do not want the position to use the anchor point - this.PositionUsesAnchorPoint = false; - // Make sure CustomView is initialized. OnInitialize(); diff --git a/Tizen.NUI/src/public/BaseComponents/ImageView.cs b/Tizen.NUI/src/public/BaseComponents/ImageView.cs index ce3a7d4..e5ea920 100755 --- a/Tizen.NUI/src/public/BaseComponents/ImageView.cs +++ b/Tizen.NUI/src/public/BaseComponents/ImageView.cs @@ -40,8 +40,6 @@ namespace Tizen.NUI.BaseComponents internal ImageView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ImageView_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ImageView obj) diff --git a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs index 366d821..008211d 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextEditor.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextEditor.cs @@ -40,8 +40,6 @@ namespace Tizen.NUI.BaseComponents internal TextEditor(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextEditor_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextEditor obj) diff --git a/Tizen.NUI/src/public/BaseComponents/TextField.cs b/Tizen.NUI/src/public/BaseComponents/TextField.cs index c898ac8..0c31cd9 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextField.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextField.cs @@ -40,8 +40,6 @@ namespace Tizen.NUI.BaseComponents internal TextField(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextField_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextField obj) diff --git a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs index 10d6acb..4cacebf 100755 --- a/Tizen.NUI/src/public/BaseComponents/TextLabel.cs +++ b/Tizen.NUI/src/public/BaseComponents/TextLabel.cs @@ -38,8 +38,6 @@ namespace Tizen.NUI.BaseComponents internal TextLabel(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TextLabel_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TextLabel obj) diff --git a/Tizen.NUI/src/public/BaseComponents/View.cs b/Tizen.NUI/src/public/BaseComponents/View.cs index 698d0d2..71e85ce 100755 --- a/Tizen.NUI/src/public/BaseComponents/View.cs +++ b/Tizen.NUI/src/public/BaseComponents/View.cs @@ -30,6 +30,7 @@ namespace Tizen.NUI.BaseComponents internal View(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.View_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); + PositionUsesPivotPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(View obj) @@ -801,7 +802,6 @@ namespace Tizen.NUI.BaseComponents /// public View() : this(NDalicPINVOKE.View_New(), true) { - PositionUsesAnchorPoint = false; if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); } @@ -1723,7 +1723,7 @@ namespace Tizen.NUI.BaseComponents /// /// Sets the position of the View for X and Y.
- /// By default, sets the position vector between the parent origin and anchor point(default).
+ /// By default, sets the position vector between the parent origin and pivot point(default).
/// If Position inheritance if disabled, sets the world position.
/// public Position2D Position2D @@ -1754,13 +1754,13 @@ namespace Tizen.NUI.BaseComponents } /// - /// Determines whether the anchor point should be used to determine the position of the view. + /// Determines whether the pivot point should be used to determine the position of the view. /// This is true by default. /// /// If false, then the top-left of the view is used for the position. /// Setting this to false will allow scaling or rotation around the anchor-point without affecting the view's position. /// - public bool PositionUsesAnchorPoint + public bool PositionUsesPivotPoint { get { @@ -2818,7 +2818,7 @@ namespace Tizen.NUI.BaseComponents /// /// Gets/Sets the anchor-point of an view.
/// This is expressed in unit coordinates, such that (0.0, 0.0, 0.5) is the top-left corner of the view, and (1.0, 1.0, 0.5) is the bottom-right corner.
- /// The default anchor point is AnchorPoint.Center (0.5, 0.5, 0.5).
+ /// The default pivot point is PivotPoint.Center (0.5, 0.5, 0.5).
/// An view position is the distance between its parent-origin and this anchor-point.
/// An view's orientation is the rotation from its default orientation, the rotation is centered around its anchor-point.
/// 
The View has been initialized.
@@ -2915,7 +2915,7 @@ namespace Tizen.NUI.BaseComponents /// /// Gets/Sets the position of the View.
- /// By default, sets the position vector between the parent origin and anchor point(default).
+ /// By default, sets the position vector between the parent origin and pivot point(default).
/// If Position inheritance if disabled, sets the world position.
/// public Position Position @@ -3576,7 +3576,7 @@ namespace Tizen.NUI.BaseComponents /// /// Gets/Sets whether a child view inherits it's parent's position.
/// Default is to inherit.
- /// Switching this off means that using Position sets the view's world position, i.e. translates from the world origin(0,0,0) to the anchor point of the view.
+ /// Switching this off means that using Position sets the view's world position, i.e. translates from the world origin(0,0,0) to the pivot point of the view.
/// public bool InheritPosition { diff --git a/Tizen.NUI/src/public/FlexContainer.cs b/Tizen.NUI/src/public/FlexContainer.cs index e82bc4c..09b1985 100755 --- a/Tizen.NUI/src/public/FlexContainer.cs +++ b/Tizen.NUI/src/public/FlexContainer.cs @@ -41,8 +41,6 @@ namespace Tizen.NUI internal FlexContainer(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.FlexContainer_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(FlexContainer obj) diff --git a/Tizen.NUI/src/public/NUIConstants.cs b/Tizen.NUI/src/public/NUIConstants.cs index cd559ae..2b63ffd 100755 --- a/Tizen.NUI/src/public/NUIConstants.cs +++ b/Tizen.NUI/src/public/NUIConstants.cs @@ -1072,7 +1072,7 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants. + /// PivotPoint constants. /// public struct PivotPoint { diff --git a/Tizen.NUI/src/public/Position.cs b/Tizen.NUI/src/public/Position.cs index cff3f9b..1c66e93 100755 --- a/Tizen.NUI/src/public/Position.cs +++ b/Tizen.NUI/src/public/Position.cs @@ -558,9 +558,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.0 + /// PivotPoint constants: 0.0 /// - public static float AnchorPointTop + public static float PivotPointTop { get { @@ -571,9 +571,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 1.0 + /// PivotPoint constants: 1.0 /// - public static float AnchorPointBottom + public static float PivotPointBottom { get { @@ -584,9 +584,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.0 + /// PivotPoint constants: 0.0 /// - public static float AnchorPointLeft + public static float PivotPointLeft { get { @@ -597,9 +597,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 1.0 + /// PivotPoint constants: 1.0 /// - public static float AnchorPointRight + public static float PivotPointRight { get { @@ -610,9 +610,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.0 + /// PivotPoint constants: 0.0 /// - public static float AnchorPointMiddle + public static float PivotPointMiddle { get { @@ -623,9 +623,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.0, 0.0, 0.5 + /// PivotPoint constants: 0.0, 0.0, 0.5 /// - public static Position AnchorPointTopLeft + public static Position PivotPointTopLeft { get { @@ -637,9 +637,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.5, 0.0, 0.5 + /// PivotPoint constants: 0.5, 0.0, 0.5 /// - public static Position AnchorPointTopCenter + public static Position PivotPointTopCenter { get { @@ -651,9 +651,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 1.0, 0.0, 0.5 + /// PivotPoint constants: 1.0, 0.0, 0.5 /// - public static Position AnchorPointTopRight + public static Position PivotPointTopRight { get { @@ -665,9 +665,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.0, 0.5, 0.5 + /// PivotPoint constants: 0.0, 0.5, 0.5 /// - public static Position AnchorPointCenterLeft + public static Position PivotPointCenterLeft { get { @@ -679,9 +679,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.5, 0.5, 0.5 + /// PivotPoint constants: 0.5, 0.5, 0.5 /// - public static Position AnchorPointCenter + public static Position PivotPointCenter { get { @@ -693,9 +693,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 1.0, 0.5, 0.5 + /// PivotPoint constants: 1.0, 0.5, 0.5 /// - public static Position AnchorPointCenterRight + public static Position PivotPointCenterRight { get { @@ -707,9 +707,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.0, 1.0, 0.5 + /// PivotPoint constants: 0.0, 1.0, 0.5 /// - public static Position AnchorPointBottomLeft + public static Position PivotPointBottomLeft { get { @@ -721,9 +721,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 0.5, 1.0, 0.5 + /// PivotPoint constants: 0.5, 1.0, 0.5 /// - public static Position AnchorPointBottomCenter + public static Position PivotPointBottomCenter { get { @@ -735,9 +735,9 @@ namespace Tizen.NUI } /// - /// AnchorPoint constants: 1.0, 1.0, 0.5 + /// PivotPoint constants: 1.0, 1.0, 0.5 /// - public static Position AnchorPointBottomRight + public static Position PivotPointBottomRight { get { diff --git a/Tizen.NUI/src/public/ProgressBar.cs b/Tizen.NUI/src/public/ProgressBar.cs index 913f913..5de2847 100755 --- a/Tizen.NUI/src/public/ProgressBar.cs +++ b/Tizen.NUI/src/public/ProgressBar.cs @@ -41,8 +41,6 @@ namespace Tizen.NUI.UIComponents internal ProgressBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ProgressBar_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ProgressBar obj) diff --git a/Tizen.NUI/src/public/Scrollable.cs b/Tizen.NUI/src/public/Scrollable.cs index 57e8a9d..f464990 100755 --- a/Tizen.NUI/src/public/Scrollable.cs +++ b/Tizen.NUI/src/public/Scrollable.cs @@ -22,8 +22,6 @@ namespace Tizen.NUI internal Scrollable(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Scrollable_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Scrollable obj) @@ -485,4 +483,4 @@ namespace Tizen.NUI } -} \ No newline at end of file +} diff --git a/Tizen.NUI/src/public/TableView.cs b/Tizen.NUI/src/public/TableView.cs index 28f5aad..99ca7dd 100755 --- a/Tizen.NUI/src/public/TableView.cs +++ b/Tizen.NUI/src/public/TableView.cs @@ -42,8 +42,6 @@ namespace Tizen.NUI internal TableView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.TableView_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(TableView obj) diff --git a/Tizen.NUI/src/public/UIComponents/Button.cs b/Tizen.NUI/src/public/UIComponents/Button.cs index 4559b03..313d2f9 100755 --- a/Tizen.NUI/src/public/UIComponents/Button.cs +++ b/Tizen.NUI/src/public/UIComponents/Button.cs @@ -43,8 +43,6 @@ namespace Tizen.NUI.UIComponents internal Button(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Button_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Button obj) diff --git a/Tizen.NUI/src/public/UIComponents/Popup.cs b/Tizen.NUI/src/public/UIComponents/Popup.cs index 72ad327..4d7a0e2 100755 --- a/Tizen.NUI/src/public/UIComponents/Popup.cs +++ b/Tizen.NUI/src/public/UIComponents/Popup.cs @@ -41,8 +41,6 @@ namespace Tizen.NUI.UIComponents internal Popup(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.Popup_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(Popup obj) diff --git a/Tizen.NUI/src/public/UIComponents/ScrollBar.cs b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs index 828af76..bb6e19c 100755 --- a/Tizen.NUI/src/public/UIComponents/ScrollBar.cs +++ b/Tizen.NUI/src/public/UIComponents/ScrollBar.cs @@ -42,8 +42,6 @@ namespace Tizen.NUI.UIComponents internal ScrollBar(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.ScrollBar_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ScrollBar obj) diff --git a/Tizen.NUI/src/public/VideoView.cs b/Tizen.NUI/src/public/VideoView.cs index a5363ca..f50f417 100755 --- a/Tizen.NUI/src/public/VideoView.cs +++ b/Tizen.NUI/src/public/VideoView.cs @@ -41,8 +41,6 @@ namespace Tizen.NUI internal VideoView(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicPINVOKE.VideoView_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(VideoView obj) diff --git a/Tizen.NUI/src/public/ViewWrapper.cs b/Tizen.NUI/src/public/ViewWrapper.cs index deb1b85..f931357 100755 --- a/Tizen.NUI/src/public/ViewWrapper.cs +++ b/Tizen.NUI/src/public/ViewWrapper.cs @@ -27,8 +27,6 @@ namespace Tizen.NUI internal ViewWrapper(global::System.IntPtr cPtr, bool cMemoryOwn) : base(NDalicManualPINVOKE.ViewWrapper_SWIGUpcast(cPtr), cMemoryOwn) { swigCPtr = new global::System.Runtime.InteropServices.HandleRef(this, cPtr); - // By default, we do not want the position to use the anchor point - PositionUsesAnchorPoint = false; } internal static global::System.Runtime.InteropServices.HandleRef getCPtr(ViewWrapper obj) -- 2.7.4