From: dongsug.song Date: Thu, 23 Mar 2017 09:57:44 +0000 (+0900) Subject: to resolve TCT issues X-Git-Tag: accepted/tizen/common/20170324.123341~5 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=ff50f3a9930986ba9133c65032a44cf05fa65bca;p=platform%2Fcore%2Fcsapi%2Fnui.git to resolve TCT issues Change-Id: I8f808b9c74744fa986ea684454a1b00cc885fef0 Signed-off-by: dongsug.song --- diff --git a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj index 70f7725..563a0a8 100755 --- a/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj +++ b/NUISamples/NUISamples.TizenTV/NUISamples.TizenTV.csproj @@ -70,10 +70,6 @@ - - - - diff --git a/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs b/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs index 041a595..26f0c2f 100755 --- a/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs +++ b/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs @@ -293,13 +293,13 @@ namespace ControlDashboard PropertyArray iconTooltipContent = new PropertyArray(); PropertyMap iconVisual = new PropertyMap(); - iconVisual.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Image)) - .Add(Tizen.NUI.Constants.ImageVisualProperty.URL, new PropertyValue(_resPath + "/images/star-highlight.png")); + iconVisual.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image)) + .Add(ImageVisualProperty.URL, new PropertyValue(_resPath + "/images/star-highlight.png")); iconTooltipContent.Add(new PropertyValue(iconVisual)); PropertyMap textVisual = new PropertyMap(); - textVisual.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Text)) - .Add(Tizen.NUI.Constants.TextVisualProperty.Text, new PropertyValue("Tooltip with Icon")); + textVisual.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text)) + .Add(TextVisualProperty.Text, new PropertyValue("Tooltip with Icon")); iconTooltipContent.Add(new PropertyValue(textVisual)); PropertyMap iconTooltip = new PropertyMap(); @@ -463,9 +463,9 @@ namespace ControlDashboard void OnProgressBarValueChanged(object source, ProgressBar.ValueChangedEventArgs e) { PropertyMap labelVisual = new PropertyMap(); - labelVisual.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Text)) - .Add(Tizen.NUI.Constants.TextVisualProperty.Text, new PropertyValue(Math.Round(e.ProgressBar.ProgressValue, 2) + " / " + Math.Round(e.ProgressBar.SecondaryProgressValue, 2))) - .Add(Tizen.NUI.Constants.TextVisualProperty.PointSize, new PropertyValue(10.0f)); + labelVisual.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text)) + .Add(TextVisualProperty.Text, new PropertyValue(Math.Round(e.ProgressBar.ProgressValue, 2) + " / " + Math.Round(e.ProgressBar.SecondaryProgressValue, 2))) + .Add(TextVisualProperty.PointSize, new PropertyValue(10.0f)); e.ProgressBar.LabelVisual = labelVisual; return; } diff --git a/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs b/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs index 18e6044..aac157c 100755 --- a/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs +++ b/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs @@ -68,8 +68,8 @@ namespace VisualViewTest imageVisualMap1.Offset = new Vector2(10.0f, 10.0f); imageVisualMap1.OffsetPolicy = new Vector2(1, 1); imageVisualMap1.SizePolicy = new Vector2(1, 1); - imageVisualMap1.Origin = AlignType.TOP_BEGIN; - imageVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; + imageVisualMap1.Origin = AlignType.TopBegin; + imageVisualMap1.AnchorPoint = AlignType.TopBegin; _visualView.AddVisual("imageVisual1", imageVisualMap1); /* image visual 2. */ @@ -79,8 +79,8 @@ namespace VisualViewTest imageVisualMap2.Offset = new Vector2(220.0f, 10.0f); imageVisualMap2.OffsetPolicy = new Vector2(1, 1); imageVisualMap2.SizePolicy = new Vector2(1, 1); - imageVisualMap2.Origin = AlignType.TOP_BEGIN; - imageVisualMap2.AnchorPoint = AlignType.TOP_BEGIN; + imageVisualMap2.Origin = AlignType.TopBegin; + imageVisualMap2.AnchorPoint = AlignType.TopBegin; _visualView.AddVisual("imageVisual2", imageVisualMap2); /* Modify imageVisual2, we just need do this. */ @@ -101,8 +101,8 @@ namespace VisualViewTest textVisualMap1.Offset = new Vector2(10.0f, 220.0f); textVisualMap1.OffsetPolicy = new Vector2(1, 1); textVisualMap1.SizePolicy = new Vector2(1, 1); - textVisualMap1.Origin = AlignType.TOP_BEGIN; - textVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; + textVisualMap1.Origin = AlignType.TopBegin; + textVisualMap1.AnchorPoint = AlignType.TopBegin; _visualView.AddVisual("textVisual1", textVisualMap1); /* border visual */ @@ -114,9 +114,9 @@ namespace VisualViewTest borderVisualMap1.Offset = new Vector2(10.0f, 380.0f); borderVisualMap1.OffsetPolicy = new Vector2(1, 1); borderVisualMap1.SizePolicy = new Vector2(1, 1); - borderVisualMap1.Origin = AlignType.TOP_BEGIN; - borderVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "borderVisual1", borderVisualMap1); + borderVisualMap1.Origin = AlignType.TopBegin; + borderVisualMap1.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("borderVisual1", borderVisualMap1); /* gradient visual */ GradientVisualMap gradientVisualMap1 = new GradientVisualMap(); @@ -128,104 +128,104 @@ namespace VisualViewTest stopOffset.Add(new PropertyValue(1.0f)); gradientVisualMap1.StopOffset = stopOffset; PropertyArray stopColor = new PropertyArray(); - stopColor.Add(new PropertyValue(new Vector4( 129.0f, 198.0f, 193.0f, 255.0f )/255.0f)); - stopColor.Add(new PropertyValue(new Vector4( 196.0f, 198.0f, 71.0f, 122.0f )/255.0f)); - stopColor.Add(new PropertyValue(new Vector4( 214.0f, 37.0f, 139.0f, 191.0f )/255.0f)); - stopColor.Add(new PropertyValue(new Vector4( 129.0f, 198.0f, 193.0f, 150.0f )/255.0f)); + stopColor.Add(new PropertyValue(new Vector4(129.0f, 198.0f, 193.0f, 255.0f) / 255.0f)); + stopColor.Add(new PropertyValue(new Vector4(196.0f, 198.0f, 71.0f, 122.0f) / 255.0f)); + stopColor.Add(new PropertyValue(new Vector4(214.0f, 37.0f, 139.0f, 191.0f) / 255.0f)); + stopColor.Add(new PropertyValue(new Vector4(129.0f, 198.0f, 193.0f, 150.0f) / 255.0f)); stopColor.Add(new PropertyValue(Color.Yellow)); gradientVisualMap1.StopColor = stopColor; - gradientVisualMap1.StartPosition = new Vector2( 0.5f, 0.5f ); - gradientVisualMap1.EndPosition = new Vector2( -0.5f, -0.5f ); - gradientVisualMap1.Center = new Vector2( 0.5f, 0.5f); + gradientVisualMap1.StartPosition = new Vector2(0.5f, 0.5f); + gradientVisualMap1.EndPosition = new Vector2(-0.5f, -0.5f); + gradientVisualMap1.Center = new Vector2(0.5f, 0.5f); gradientVisualMap1.Radius = 1.414f; gradientVisualMap1.VisualSize = new Vector2(100.0f, 100.0f); gradientVisualMap1.Offset = new Vector2(120.0f, 380.0f); gradientVisualMap1.OffsetPolicy = new Vector2(1, 1); gradientVisualMap1.SizePolicy = new Vector2(1, 1); - gradientVisualMap1.Origin = AlignType.TOP_BEGIN; - gradientVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "gradientVisual1", gradientVisualMap1); + gradientVisualMap1.Origin = AlignType.TopBegin; + gradientVisualMap1.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("gradientVisual1", gradientVisualMap1); /* primitive visual: Cone */ PrimitiveVisualMap primitiveVisualMap1 = new PrimitiveVisualMap(); primitiveVisualMap1.Shape = PrimitiveVisualShapeType.Cone; primitiveVisualMap1.BevelPercentage = 0.3f; primitiveVisualMap1.BevelSmoothness = 0.0f; - primitiveVisualMap1.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f); - primitiveVisualMap1.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f); + primitiveVisualMap1.ScaleDimensions = new Vector3(1.0f, 1.0f, 0.3f); + primitiveVisualMap1.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f); primitiveVisualMap1.VisualSize = new Vector2(100.0f, 100.0f); primitiveVisualMap1.Offset = new Vector2(230.0f, 380.0f); primitiveVisualMap1.OffsetPolicy = new Vector2(1, 1); primitiveVisualMap1.SizePolicy = new Vector2(1, 1); - primitiveVisualMap1.Origin = AlignType.TOP_BEGIN; - primitiveVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "primitiveVisual1", primitiveVisualMap1); + primitiveVisualMap1.Origin = AlignType.TopBegin; + primitiveVisualMap1.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("primitiveVisual1", primitiveVisualMap1); /* primitive visual: Sphere */ PrimitiveVisualMap primitiveVisualMap2 = new PrimitiveVisualMap(); primitiveVisualMap2.Shape = PrimitiveVisualShapeType.Sphere; primitiveVisualMap2.BevelPercentage = 0.3f; primitiveVisualMap2.BevelSmoothness = 0.0f; - primitiveVisualMap2.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f); - primitiveVisualMap2.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f); + primitiveVisualMap2.ScaleDimensions = new Vector3(1.0f, 1.0f, 0.3f); + primitiveVisualMap2.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f); primitiveVisualMap2.VisualSize = new Vector2(100.0f, 100.0f); primitiveVisualMap2.Offset = new Vector2(340.0f, 380.0f); primitiveVisualMap2.OffsetPolicy = new Vector2(1, 1); primitiveVisualMap2.SizePolicy = new Vector2(1, 1); - primitiveVisualMap2.Origin = AlignType.TOP_BEGIN; - primitiveVisualMap2.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "primitiveVisual2", primitiveVisualMap2); + primitiveVisualMap2.Origin = AlignType.TopBegin; + primitiveVisualMap2.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("primitiveVisual2", primitiveVisualMap2); /* primitive visual: Cylinder */ PrimitiveVisualMap primitiveVisualMap3 = new PrimitiveVisualMap(); primitiveVisualMap3.Shape = PrimitiveVisualShapeType.Cylinder; primitiveVisualMap3.BevelPercentage = 0.3f; primitiveVisualMap3.BevelSmoothness = 0.0f; - primitiveVisualMap3.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f); - primitiveVisualMap3.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f); + primitiveVisualMap3.ScaleDimensions = new Vector3(1.0f, 1.0f, 0.3f); + primitiveVisualMap3.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f); primitiveVisualMap3.VisualSize = new Vector2(100.0f, 100.0f); primitiveVisualMap3.Offset = new Vector2(10.0f, 490.0f); primitiveVisualMap3.OffsetPolicy = new Vector2(1, 1); primitiveVisualMap3.SizePolicy = new Vector2(1, 1); - primitiveVisualMap3.Origin = AlignType.TOP_BEGIN; - primitiveVisualMap3.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "primitiveVisual3", primitiveVisualMap3); + primitiveVisualMap3.Origin = AlignType.TopBegin; + primitiveVisualMap3.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("primitiveVisual3", primitiveVisualMap3); /* primitive visual: ConicalFrustrum */ PrimitiveVisualMap primitiveVisualMap4 = new PrimitiveVisualMap(); primitiveVisualMap4.Shape = PrimitiveVisualShapeType.ConicalFrustrum; primitiveVisualMap4.BevelPercentage = 0.3f; primitiveVisualMap4.BevelSmoothness = 0.0f; - primitiveVisualMap4.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f); - primitiveVisualMap4.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f); + primitiveVisualMap4.ScaleDimensions = new Vector3(1.0f, 1.0f, 0.3f); + primitiveVisualMap4.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f); primitiveVisualMap4.VisualSize = new Vector2(100.0f, 100.0f); primitiveVisualMap4.Offset = new Vector2(120.0f, 490.0f); primitiveVisualMap4.OffsetPolicy = new Vector2(1, 1); primitiveVisualMap4.SizePolicy = new Vector2(1, 1); - primitiveVisualMap4.Origin = AlignType.TOP_BEGIN; - primitiveVisualMap4.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "primitiveVisual4", primitiveVisualMap4); + primitiveVisualMap4.Origin = AlignType.TopBegin; + primitiveVisualMap4.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("primitiveVisual4", primitiveVisualMap4); /* primitive visual: Cube */ PrimitiveVisualMap primitiveVisualMap5 = new PrimitiveVisualMap(); primitiveVisualMap5.Shape = PrimitiveVisualShapeType.Cube; primitiveVisualMap5.BevelPercentage = 0.3f; primitiveVisualMap5.BevelSmoothness = 0.0f; - primitiveVisualMap5.ScaleDimensions = new Vector3(1.0f,1.0f,0.3f); - primitiveVisualMap5.MixColor = new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f); + primitiveVisualMap5.ScaleDimensions = new Vector3(1.0f, 1.0f, 0.3f); + primitiveVisualMap5.MixColor = new Vector4((245.0f / 255.0f), (188.0f / 255.0f), (73.0f / 255.0f), 1.0f); primitiveVisualMap5.VisualSize = new Vector2(100.0f, 100.0f); primitiveVisualMap5.Offset = new Vector2(230.0f, 490.0f); primitiveVisualMap5.OffsetPolicy = new Vector2(1, 1); primitiveVisualMap5.SizePolicy = new Vector2(1, 1); - primitiveVisualMap5.Origin = AlignType.TOP_BEGIN; - primitiveVisualMap5.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "primitiveVisual5", primitiveVisualMap5); + primitiveVisualMap5.Origin = AlignType.TopBegin; + primitiveVisualMap5.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("primitiveVisual5", primitiveVisualMap5); /* mesh visual nothing show. */ MeshVisualMap meshVisualMap1 = new MeshVisualMap(); @@ -238,13 +238,13 @@ namespace VisualViewTest meshVisualMap1.Offset = new Vector2(10.0f, 600.0f); meshVisualMap1.OffsetPolicy = new Vector2(1, 1); meshVisualMap1.SizePolicy = new Vector2(1, 1); - meshVisualMap1.Origin = AlignType.TOP_BEGIN; - meshVisualMap1.AnchorPoint = AlignType.TOP_BEGIN; - _visualView.AddVisual( "meshVisual1", meshVisualMap1); + meshVisualMap1.Origin = AlignType.TopBegin; + meshVisualMap1.AnchorPoint = AlignType.TopBegin; + _visualView.AddVisual("meshVisual1", meshVisualMap1); } [STAThread] - static void Main(string[] args) + static void _Main(string[] args) { Example example = new Example(); example.Run(args); diff --git a/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/ContactData.cs b/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/ContactData.cs deleted file mode 100755 index 6490c62..0000000 --- a/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/ContactData.cs +++ /dev/null @@ -1,111 +0,0 @@ -/* - * 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. - * - */ - -using System; -using Tizen.NUI; -using Tizen.NUI.Constants; - -namespace VisualsUsingCustomView -{ - // The collection of contacts - static class ContactsList - { - public static readonly ContactItem[] s_contactData = new ContactItem[] - { - new ContactItem ("Emmett Yates", "./images/gallery-small-43.jpg", - new Color((73.0f/255.0f),(182.0f/255.0f), (245.0f/255.0f), 1.0f), - (int)PrimitiveVisualShapeType.Cone), - new ContactItem ("Leslie Wong", "./images/gallery-2.jpg", - new Color((51.0f/255.0f), (51.0f/255.0f), (102.0f/255.0f), 1.0f), - (int)PrimitiveVisualShapeType.Sphere), - new ContactItem ("Walter Jensen", "./images/gallery-0.jpg", - new Color((151.0f/255.0f), (214.0f/255.0f), (240.0f/255.0f), 1.0f), - (int)PrimitiveVisualShapeType.Cylinder), - new ContactItem ("Dan Haynes", "./images/gallery-1.jpg", - new Color((102.0f/255.0f), (251.0f/255.0f), (102.0f/255.0f), 1.0f), - (int)PrimitiveVisualShapeType.ConicalFrustrum), - new ContactItem ("Mable Hodges", "./images/gallery-3.jpg", - new Color((255.0f/255.0f), (102.0f/255.0f), (102.0f/255.0f), 1.0f), - (int)PrimitiveVisualShapeType.Cube) - }; - } - - // The information for an individual contact - class ContactItem - { - private string _name; - private string _imageURL; - private Color _color; - private int _shape; - - public ContactItem (string name, string imageURL, Color color, int shape) - { - _name = name; - _imageURL = imageURL; - _color = color; - _shape = shape; - } - - public string ImageURL - { - get - { - return _imageURL; - } - set - { - _imageURL = value; - } - } - - public string Name - { - get - { - return _name; - } - set - { - _name = value; - } - } - - public Color Color - { - get - { - return _color; - } - set - { - _color = value; - } - } - - public int Shape - { - get - { - return _shape; - } - set - { - _shape = value; - } - } - } -} \ No newline at end of file diff --git a/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/ContactView.cs b/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/ContactView.cs deleted file mode 100755 index 963d517..0000000 --- a/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/ContactView.cs +++ /dev/null @@ -1,199 +0,0 @@ -/* - * 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. - * - */ - -using System; -using Tizen.NUI; -using Tizen.NUI.Constants; - -// A ContactView is a Custom View which consists of four visuals (Image, Primitive, Text and Color). -// All of these visuals can be configured via properties - ImageURL (Image), Shape (Primitive), Name (Text) and Color. -// Tap gesture is also enabled on the ContactView which changes the color visual to some random color when ContactView is tapped. - -namespace VisualsUsingCustomView -{ - public class ContactView : CustomView - { - private const int ColorVisualPropertyIndex = 0; - private const int PrimitiveVisualPropertyIndex = 1; - private const int ImageVisualPropertyIndex = 2; - private const int TextVisualPropertyIndex = 3; - private VisualBase _imageVisual; - private VisualBase _colorVisual; - private VisualBase _primitiveVisual; - private VisualBase _textVisual; - private int _shape; - private string _imageURL; - private string _name; - private Color _color; - - public ContactView() : base(typeof(ContactView).Name, CustomViewBehaviour.RequiresKeyboardNavigationSupport) - { - } - - public string ImageURL - { - get - { - return _imageURL; - } - set - { - _imageURL = value; - - // Create and Register Image Visual - PropertyMap imageVisual = new PropertyMap(); - imageVisual.Add( Visual.Property.Type, new PropertyValue( (int)Visual.Type.Image )) - .Add( ImageVisualProperty.URL, new PropertyValue( _imageURL )); - _imageVisual = VisualFactory.Get().CreateVisual( imageVisual ); - RegisterVisual( ImageVisualPropertyIndex, _imageVisual ); - - // Set the depth index for Image visual - _imageVisual.DepthIndex = ImageVisualPropertyIndex; - } - } - - public string Name - { - get - { - return _name; - } - set - { - _name = value; - - // Create and Register Text Visual - PropertyMap textVisual = new PropertyMap(); - textVisual.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text)) - .Add(TextVisualProperty.Text, new PropertyValue(_name)) - .Add(TextVisualProperty.TextColor, new PropertyValue(Color.White)) - .Add(TextVisualProperty.PointSize, new PropertyValue(15)) - .Add( TextVisualProperty.HorizontalAlignment, new PropertyValue("CENTER")) - .Add( TextVisualProperty.VerticalAlignment, new PropertyValue("CENTER")); - _textVisual = VisualFactory.Get().CreateVisual( textVisual ); - RegisterVisual( TextVisualPropertyIndex, _textVisual ); - - // Set the depth index for Text visual - _textVisual.DepthIndex = TextVisualPropertyIndex; - } - } - - public Color Color - { - get - { - return _color; - } - set - { - _color = value; - - // Create and Register Color Visual - PropertyMap colorVisual = new PropertyMap(); - colorVisual.Add( Visual.Property.Type, new PropertyValue( (int)Visual.Type.Color )) - .Add( ColorVisualProperty.MixColor, new PropertyValue( _color )); - _colorVisual = VisualFactory.Get().CreateVisual( colorVisual ); - RegisterVisual( ColorVisualPropertyIndex, _colorVisual ); - - // Set the depth index for Color visual - _colorVisual.DepthIndex = ColorVisualPropertyIndex; - } - } - - public int Shape - { - get - { - return _shape; - } - set - { - _shape = value; - - // Create and Register Primitive Visual - PropertyMap primitiveVisual = new PropertyMap(); - primitiveVisual.Add( Visual.Property.Type, new PropertyValue( (int)Visual.Type.Primitive )) - .Add( PrimitiveVisualProperty.Shape, new PropertyValue(_shape)) - .Add( PrimitiveVisualProperty.BevelPercentage, new PropertyValue(0.3f)) - .Add( PrimitiveVisualProperty.BevelSmoothness, new PropertyValue(0.0f)) - .Add( PrimitiveVisualProperty.ScaleDimensions, new PropertyValue(new Vector3(1.0f,1.0f,0.3f))) - .Add( PrimitiveVisualProperty.MixColor, new PropertyValue(new Vector4((245.0f/255.0f), (188.0f/255.0f), (73.0f/255.0f), 1.0f))); - _primitiveVisual = VisualFactory.Get().CreateVisual( primitiveVisual ); - RegisterVisual( PrimitiveVisualPropertyIndex, _primitiveVisual ); - - // Set the depth index for Primitive visual - _primitiveVisual.DepthIndex = PrimitiveVisualPropertyIndex; - } - } - - public override void OnInitialize() - { - // Enable Tap gesture on ContactView - EnableGestureDetection(Gesture.GestureType.Tap); - } - - public override void OnTap(TapGesture tap) - { - // Change the Color visual of ContactView with some random color - Random random = new Random(); - Color = new Color((random.Next(0, 256) / 255.0f), (random.Next(0, 256) / 255.0f), (random.Next(0, 256) / 255.0f), 1.0f); - } - - public override void OnRelayout(Vector2 size, RelayoutContainer container) - { - // Configure the transform and size of Image visual. - PropertyMap imageVisualTransform = new PropertyMap(); - imageVisualTransform.Add((int)VisualTransformPropertyType.OFFSET, new PropertyValue(new Vector2(10.0f, 0.0f))) - .Add((int)VisualTransformPropertyType.OFFSET_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE))) - .Add((int)VisualTransformPropertyType.SIZE_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE))) - .Add((int)VisualTransformPropertyType.SIZE, new PropertyValue(new Vector2(40.0f, 40.0f))) - .Add((int)VisualTransformPropertyType.ORIGIN, new PropertyValue((int)AlignType.CENTER_BEGIN)) - .Add((int)VisualTransformPropertyType.ANCHOR_POINT, new PropertyValue((int)AlignType.CENTER_BEGIN)); - _imageVisual.SetTransformAndSize(imageVisualTransform, size); - - // Configure the transform and size of Text visual. - PropertyMap textVisualTransform = new PropertyMap(); - textVisualTransform.Add((int)VisualTransformPropertyType.OFFSET, new PropertyValue(new Vector2(0.0f, 0.0f))) - .Add((int)VisualTransformPropertyType.OFFSET_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.RELATIVE, (int)VisualTransformPolicyType.RELATIVE))) - .Add((int)VisualTransformPropertyType.SIZE_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE))) - .Add((int)VisualTransformPropertyType.SIZE, new PropertyValue(new Vector2(size.X - 100.0f, 50.0f))) - .Add((int)VisualTransformPropertyType.ORIGIN, new PropertyValue((int)Align.Type.Center)) - .Add((int)VisualTransformPropertyType.ANCHOR_POINT, new PropertyValue((int)Align.Type.Center)); - _textVisual.SetTransformAndSize(textVisualTransform, size); - - // Configure the transform and size of Primitive visual. - PropertyMap primitiveVisualTransform = new PropertyMap(); - primitiveVisualTransform.Add((int)VisualTransformPropertyType.OFFSET, new PropertyValue(new Vector2(size.X - 60.0f, 0.0f))) - .Add((int)VisualTransformPropertyType.OFFSET_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE))) - .Add((int)VisualTransformPropertyType.SIZE_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE))) - .Add((int)VisualTransformPropertyType.SIZE, new PropertyValue(new Vector2(40.0f, 40.0f))) - .Add((int)VisualTransformPropertyType.ORIGIN, new PropertyValue((int)AlignType.CENTER_BEGIN)) - .Add((int)VisualTransformPropertyType.ANCHOR_POINT, new PropertyValue((int)AlignType.CENTER_BEGIN)); - _primitiveVisual.SetTransformAndSize(primitiveVisualTransform, size); - - // Configure the transform and size of Color visual. This is also the default value. - PropertyMap colorVisualTransform = new PropertyMap(); - colorVisualTransform.Add( (int)VisualTransformPropertyType.OFFSET, new PropertyValue(new Vector2(0.0f,0.0f))) - .Add((int)VisualTransformPropertyType.OFFSET_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.RELATIVE, (int)VisualTransformPolicyType.RELATIVE))) - .Add((int)VisualTransformPropertyType.SIZE_POLICY, new PropertyValue(new Vector2((int)VisualTransformPolicyType.RELATIVE, (int)VisualTransformPolicyType.RELATIVE))) - .Add( (int)VisualTransformPropertyType.SIZE, new PropertyValue(new Vector2(1.0f, 1.0f)) ) - .Add( (int)VisualTransformPropertyType.ORIGIN, new PropertyValue((int)AlignType.TOP_BEGIN) ) - .Add( (int)VisualTransformPropertyType.ANCHOR_POINT, new PropertyValue((int)AlignType.TOP_BEGIN) ); - _colorVisual.SetTransformAndSize(colorVisualTransform, size); - } - } -} \ No newline at end of file diff --git a/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs b/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs deleted file mode 100755 index 6057a2b..0000000 --- a/NUISamples/NUISamples.TizenTV/examples/visuals-using-custom-view/visuals-using-custom-view.cs +++ /dev/null @@ -1,94 +0,0 @@ -/* - * 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. - * - */ - -using System; -using Tizen.NUI; -using Tizen.NUI.Constants; - -namespace VisualsUsingCustomView -{ - class VisualsExample : NUIApplication - { - public VisualsExample() : base() - { - } - - public VisualsExample(string stylesheet) : base(stylesheet) - { - } - - public VisualsExample(string stylesheet, WindowMode windowMode) : base(stylesheet, windowMode) - { - } - - protected override void OnCreate() - { - base.OnCreate(); - Initialize(); - } - - private void Initialize() - { - Stage stage = Stage.Instance; - stage.BackgroundColor = Color.White; - - TableView contentLayout = new TableView(14, 1); - contentLayout.Name = "ContentLayout"; - contentLayout.WidthResizePolicy = ResizePolicyType.FillToParent; - contentLayout.HeightResizePolicy = ResizePolicyType.FillToParent; - contentLayout.SetCellPadding(new Size2D(5, 5)); - contentLayout.BackgroundColor = new Color(0.949f, 0.949f, 0.949f, 1.0f); - - stage.GetDefaultLayer().Add(contentLayout); - - TextLabel title = new TextLabel("Contacts List with Visuals"); - title.Name = "Title"; - title.StyleName = "Title"; - title.WidthResizePolicy = ResizePolicyType.FillToParent; - title.HeightResizePolicy = ResizePolicyType.UseNaturalSize; - title.HorizontalAlignment = "CENTER"; - contentLayout.Add(title); - contentLayout.SetFitHeight(0); - - // Create ContactView(s) from ContactItem(s) in ContactsList and add them to TableView - ContactView contactView; - foreach (ContactItem contact in ContactsList.s_contactData) - { - contactView = new ContactView(); - contactView.WidthResizePolicy = ResizePolicyType.FillToParent; - contactView.HeightResizePolicy = ResizePolicyType.FillToParent; - - // Configure visuals of ContactView via properties - contactView.Name = contact.Name; - contactView.ImageURL = contact.ImageURL; - contactView.Color = contact.Color; - contactView.Shape = contact.Shape; - contentLayout.Add(contactView); - } - } - - /// - /// The main entry point for the application. - /// - [STAThread] - static void _Main(string[] args) - { - VisualsExample visualsExample = new VisualsExample("/home/owner/apps_rw/NUISamples.TizenTV/res/json/control-dashboard-theme.json"); - visualsExample.Run(args); - } - } -} \ No newline at end of file diff --git a/Tizen.NUI/Tizen.NUI.csproj b/Tizen.NUI/Tizen.NUI.csproj index a4c0e50..53d75f2 100755 --- a/Tizen.NUI/Tizen.NUI.csproj +++ b/Tizen.NUI/Tizen.NUI.csproj @@ -347,7 +347,7 @@ - + diff --git a/Tizen.NUI/src/internal/AlignType.cs b/Tizen.NUI/src/internal/AlignType.cs index 694ef82..c1537eb 100755 --- a/Tizen.NUI/src/internal/AlignType.cs +++ b/Tizen.NUI/src/internal/AlignType.cs @@ -8,6 +8,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ +/* moved to VisualMaps.cs namespace Tizen.NUI { public enum AlignType @@ -23,3 +24,4 @@ namespace Tizen.NUI BOTTOM_END } } +*/ \ No newline at end of file diff --git a/Tizen.NUI/src/internal/DaliEnumConstants.cs b/Tizen.NUI/src/internal/DaliEnumConstants.cs index d808031..7b56c45 100755 --- a/Tizen.NUI/src/internal/DaliEnumConstants.cs +++ b/Tizen.NUI/src/internal/DaliEnumConstants.cs @@ -42,132 +42,8 @@ namespace Tizen.NUI } } - public struct Align - { - public enum Type - { - TopBegin = Tizen.NUI.AlignType.TOP_BEGIN, - TopCenter = Tizen.NUI.AlignType.TOP_CENTER, - TopEnd = Tizen.NUI.AlignType.TOP_END, - CenterBegin = Tizen.NUI.AlignType.CENTER_BEGIN, - Center = Tizen.NUI.AlignType.CENTER, - CenterEnd = Tizen.NUI.AlignType.CENTER_END, - BottomBegin = Tizen.NUI.AlignType.BOTTOM_BEGIN, - BottomCenter = Tizen.NUI.AlignType.BOTTOM_CENTER, - BottomEnd = Tizen.NUI.AlignType.BOTTOM_END - } - } - public struct Visual - { - public enum Type - { - Border = Tizen.NUI.VisualType.BORDER, - Color = Tizen.NUI.VisualType.COLOR, - Gradient = Tizen.NUI.VisualType.GRADIENT, - Image = Tizen.NUI.VisualType.IMAGE, - Mesh = Tizen.NUI.VisualType.MESH, - Primitive = Tizen.NUI.VisualType.PRIMITIVE, - WireFrame = Tizen.NUI.VisualType.WIREFRAME, - Text = Tizen.NUI.VisualType.TEXT - } - public struct Property - { - public static readonly int Type = NDalic.VISUAL_PROPERTY_TYPE; - public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER; - public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM; - public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA; - public static readonly int MixColor = NDalic.VISUAL_PROPERTY_MIX_COLOR; - } - - public struct ShaderProperty - { - public static readonly int VertexShader = NDalic.VISUAL_SHADER_VERTEX; - public static readonly int FragmentShader = NDalic.VISUAL_SHADER_FRAGMENT; - public static readonly int ShaderSubdivideGridX = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_X; - public static readonly int ShaderSubdivideGridY = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_Y; - public static readonly int ShaderHints = NDalic.VISUAL_SHADER_HINTS; - } - } - - public struct BorderVisualProperty - { - public static readonly int Color = NDalic.BORDER_VISUAL_COLOR; - public static readonly int Size = NDalic.BORDER_VISUAL_SIZE; - public static readonly int AntiAliasing = NDalic.BORDER_VISUAL_ANTI_ALIASING; - } - - public struct ColorVisualProperty - { - public static readonly int MixColor = NDalic.COLOR_VISUAL_MIX_COLOR; - } - - public struct GradientVisualProperty - { - public static readonly int StartPosition = NDalic.GRADIENT_VISUAL_START_POSITION; - public static readonly int EndPosition = NDalic.GRADIENT_VISUAL_END_POSITION; - public static readonly int Center = NDalic.GRADIENT_VISUAL_CENTER; - public static readonly int Radius = NDalic.GRADIENT_VISUAL_RADIUS; - public static readonly int StopOffset = NDalic.GRADIENT_VISUAL_STOP_OFFSET; - public static readonly int StopColor = NDalic.GRADIENT_VISUAL_STOP_COLOR; - public static readonly int Units = NDalic.GRADIENT_VISUAL_UNITS; - public static readonly int SpreadMethod = NDalic.GRADIENT_VISUAL_SPREAD_METHOD; - } - - public struct ImageVisualProperty - { - public static readonly int URL = NDalic.IMAGE_VISUAL_URL; - public static readonly int FittingMode = NDalic.IMAGE_VISUAL_FITTING_MODE; - public static readonly int SamplingMode = NDalic.IMAGE_VISUAL_SAMPLING_MODE; - public static readonly int DesiredWidth = NDalic.IMAGE_VISUAL_DESIRED_WIDTH; - public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT; - public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING; - public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY; - public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA; - public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U; - public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V; - } - - public struct MeshVisualProperty - { - public static readonly int ObjectURL = NDalic.MESH_VISUAL_OBJECT_URL; - public static readonly int MaterialtURL = NDalic.MESH_VISUAL_MATERIAL_URL; - public static readonly int TexturesPath = NDalic.MESH_VISUAL_TEXTURES_PATH; - public static readonly int ShadingMode = NDalic.MESH_VISUAL_SHADING_MODE; - public static readonly int UseMipmapping = NDalic.MESH_VISUAL_USE_MIPMAPPING; - public static readonly int UseSoftNormals = NDalic.MESH_VISUAL_USE_SOFT_NORMALS; - public static readonly int LightPosition = NDalic.MESH_VISUAL_LIGHT_POSITION; - } - - public struct PrimitiveVisualProperty - { - public static readonly int Shape = NDalic.PRIMITIVE_VISUAL_SHAPE; - public static readonly int MixColor = NDalic.PRIMITIVE_VISUAL_MIX_COLOR; - public static readonly int Slices = NDalic.PRIMITIVE_VISUAL_SLICES; - public static readonly int Stacks = NDalic.PRIMITIVE_VISUAL_STACKS; - public static readonly int ScaleTopRadius = NDalic.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS; - public static readonly int ScaleBottomRadius = NDalic.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS; - public static readonly int ScaleHeight = NDalic.PRIMITIVE_VISUAL_SCALE_HEIGHT; - public static readonly int ScaleRadius = NDalic.PRIMITIVE_VISUAL_SCALE_RADIUS; - public static readonly int ScaleDimensions = NDalic.PRIMITIVE_VISUAL_SCALE_DIMENSIONS; - public static readonly int BevelPercentage = NDalic.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE; - public static readonly int BevelSmoothness = NDalic.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS; - public static readonly int LightPosition = NDalic.PRIMITIVE_VISUAL_LIGHT_POSITION; - } - - public struct TextVisualProperty - { - public static readonly int Text = NDalic.TEXT_VISUAL_TEXT; - public static readonly int FontFamily = NDalic.TEXT_VISUAL_FONT_FAMILY; - public static readonly int FontStyle = NDalic.TEXT_VISUAL_FONT_STYLE; - public static readonly int PointSize = NDalic.TEXT_VISUAL_POINT_SIZE; - public static readonly int MultiLine = NDalic.TEXT_VISUAL_MULTI_LINE; - public static readonly int HorizontalAlignment = NDalic.TEXT_VISUAL_HORIZONTAL_ALIGNMENT; - public static readonly int VerticalAlignment = NDalic.TEXT_VISUAL_VERTICAL_ALIGNMENT; - public static readonly int TextColor = NDalic.TEXT_VISUAL_TEXT_COLOR; - public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP; - } public struct Tooltip { diff --git a/Tizen.NUI/src/public/VisualFactory.cs b/Tizen.NUI/src/internal/VisualFactory.cs similarity index 99% rename from Tizen.NUI/src/public/VisualFactory.cs rename to Tizen.NUI/src/internal/VisualFactory.cs index 1ca74fb..5eae888 100755 --- a/Tizen.NUI/src/public/VisualFactory.cs +++ b/Tizen.NUI/src/internal/VisualFactory.cs @@ -14,7 +14,7 @@ namespace Tizen.NUI /// /// VisualFactory is a singleton object that provides and shares visuals between views /// - public class VisualFactory : BaseHandle + internal class VisualFactory : BaseHandle { private global::System.Runtime.InteropServices.HandleRef swigCPtr; diff --git a/Tizen.NUI/src/internal/VisualTransformPolicyType.cs b/Tizen.NUI/src/internal/VisualTransformPolicyType.cs index 61c0b69..11ff2ef 100755 --- a/Tizen.NUI/src/internal/VisualTransformPolicyType.cs +++ b/Tizen.NUI/src/internal/VisualTransformPolicyType.cs @@ -8,6 +8,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ +/* moved to VisualMaps.cs namespace Tizen.NUI { public enum VisualTransformPolicyType { @@ -16,3 +17,4 @@ public enum VisualTransformPolicyType { } } +*/ \ No newline at end of file diff --git a/Tizen.NUI/src/internal/VisualTransformPropertyType.cs b/Tizen.NUI/src/internal/VisualTransformPropertyType.cs index b659d50..e57ac85 100755 --- a/Tizen.NUI/src/internal/VisualTransformPropertyType.cs +++ b/Tizen.NUI/src/internal/VisualTransformPropertyType.cs @@ -8,6 +8,7 @@ // the SWIG interface file instead. //------------------------------------------------------------------------------ +/* moved to VisualMaps.cs namespace Tizen.NUI { public enum VisualTransformPropertyType { @@ -20,3 +21,4 @@ public enum VisualTransformPropertyType { } } +*/ \ No newline at end of file diff --git a/Tizen.NUI/src/internal/VisualType.cs b/Tizen.NUI/src/internal/VisualType.cs index 8d6d226..81164c4 100755 --- a/Tizen.NUI/src/internal/VisualType.cs +++ b/Tizen.NUI/src/internal/VisualType.cs @@ -7,7 +7,7 @@ // 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 { @@ -24,3 +24,4 @@ namespace Tizen.NUI { } } +*/ \ No newline at end of file diff --git a/Tizen.NUI/src/public/Actor.cs b/Tizen.NUI/src/public/Actor.cs index 3e15c17..1771594 100755 --- a/Tizen.NUI/src/public/Actor.cs +++ b/Tizen.NUI/src/public/Actor.cs @@ -73,8 +73,6 @@ namespace Tizen.NUI } } - - internal static Actor GetActorFromPtr(global::System.IntPtr cPtr) { Actor ret = new Actor(cPtr, false); diff --git a/Tizen.NUI/src/public/Animation.cs b/Tizen.NUI/src/public/Animation.cs index ddfac76..29bfffd 100755 --- a/Tizen.NUI/src/public/Animation.cs +++ b/Tizen.NUI/src/public/Animation.cs @@ -128,7 +128,7 @@ namespace Tizen.NUI } - public static Animation GetAnimationFromPtr(global::System.IntPtr cPtr) + internal static Animation GetAnimationFromPtr(global::System.IntPtr cPtr) { Animation ret = new Animation(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/Button.cs b/Tizen.NUI/src/public/Button.cs index d0be34a..d1bb50c 100755 --- a/Tizen.NUI/src/public/Button.cs +++ b/Tizen.NUI/src/public/Button.cs @@ -242,7 +242,7 @@ namespace Tizen.NUI - public static Button GetButtonFromPtr(global::System.IntPtr cPtr) + internal static Button GetButtonFromPtr(global::System.IntPtr cPtr) { Button ret = new Button(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/LongPressGesture.cs b/Tizen.NUI/src/public/LongPressGesture.cs index 678d03b..b69a996 100755 --- a/Tizen.NUI/src/public/LongPressGesture.cs +++ b/Tizen.NUI/src/public/LongPressGesture.cs @@ -59,7 +59,7 @@ namespace Tizen.NUI } - public static LongPressGesture GetLongPressGestureFromPtr(global::System.IntPtr cPtr) + internal static LongPressGesture GetLongPressGestureFromPtr(global::System.IntPtr cPtr) { LongPressGesture ret = new LongPressGesture(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/PanGesture.cs b/Tizen.NUI/src/public/PanGesture.cs index 4a7e6f7..97ea9cd 100755 --- a/Tizen.NUI/src/public/PanGesture.cs +++ b/Tizen.NUI/src/public/PanGesture.cs @@ -64,7 +64,7 @@ namespace Tizen.NUI } - public static PanGesture GetPanGestureFromPtr(global::System.IntPtr cPtr) + internal static PanGesture GetPanGestureFromPtr(global::System.IntPtr cPtr) { PanGesture ret = new PanGesture(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/PinchGesture.cs b/Tizen.NUI/src/public/PinchGesture.cs index eb5f26c..b0b361c 100755 --- a/Tizen.NUI/src/public/PinchGesture.cs +++ b/Tizen.NUI/src/public/PinchGesture.cs @@ -59,7 +59,7 @@ namespace Tizen.NUI } - public static PinchGesture GetPinchGestureFromPtr(global::System.IntPtr cPtr) + internal static PinchGesture GetPinchGestureFromPtr(global::System.IntPtr cPtr) { PinchGesture ret = new PinchGesture(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/Position.cs b/Tizen.NUI/src/public/Position.cs index 641f00b..3aa8a4e 100755 --- a/Tizen.NUI/src/public/Position.cs +++ b/Tizen.NUI/src/public/Position.cs @@ -15,801 +15,857 @@ * */ -namespace Tizen.NUI { - -/// -/// Position is a three dimensional vector. -/// -public class Position : global::System.IDisposable { - private global::System.Runtime.InteropServices.HandleRef swigCPtr; - protected bool swigCMemOwn; - - internal Position(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(Position obj) { - return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; - } - - ~Position() { - DisposeQueue.Instance.Add(this); - } - - public virtual void Dispose() { - if (!Stage.IsInstalled()) { - DisposeQueue.Instance.Add(this); - return; - } +namespace Tizen.NUI +{ + + /// + /// Position is a three dimensional vector. + /// + public class Position : global::System.IDisposable + { + private global::System.Runtime.InteropServices.HandleRef swigCPtr; + protected bool swigCMemOwn; + + internal Position(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(Position obj) + { + return (obj == null) ? new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero) : obj.swigCPtr; + } + + ~Position() + { + DisposeQueue.Instance.Add(this); + } + + public virtual void Dispose() + { + if (!Stage.IsInstalled()) + { + DisposeQueue.Instance.Add(this); + return; + } + + lock (this) + { + if (swigCPtr.Handle != global::System.IntPtr.Zero) + { + if (swigCMemOwn) + { + swigCMemOwn = false; + NDalicPINVOKE.delete_Vector3(swigCPtr); + } + swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); + } + global::System.GC.SuppressFinalize(this); + } + } + + + /// + /// Addition operator. + /// + /// Vector to add + /// Vector to add + /// A vector containing the result of the addition + public static Position operator +(Position arg1, Position arg2) + { + return arg1.Add(arg2); + } + + /// + /// Subtraction operator. + /// + /// Vector to subtract + /// Vector to subtract + /// A vector containing the result of the subtraction + public static Position operator -(Position arg1, Position arg2) + { + return arg1.Subtract(arg2); + } + + /// + /// Unary negation operator. + /// + /// Vector to netate + /// A vector containg the negation + public static Position operator -(Position arg1) + { + return arg1.Subtract(); + } + + /// + /// Multiplication operator. + /// + /// The vector to multiply + /// The vector to multiply + /// A vector containing the result of the multiplication + public static Position operator *(Position arg1, Position arg2) + { + return arg1.Multiply(arg2); + } + + /// + /// Multiplication operator. + /// + /// The vector to multiply + /// The float value to scale the vector + /// A vector containing the result of the scaling + public static Position operator *(Position arg1, float arg2) + { + return arg1.Multiply(arg2); + } + + /// + /// Division operator. + /// + /// The vector to divide + /// The vector to divide + /// A vector containing the result of the division + public static Position operator /(Position arg1, Position arg2) + { + return arg1.Divide(arg2); + } + + /// + /// Division operator. + /// + /// The vector to divide + /// The float value to scale the vector by + /// A vector containing the result of the scaling + public static Position operator /(Position arg1, float arg2) + { + return arg1.Divide(arg2); + } + + + /// + /// Const array subscript operator overload. Should be 0, 1 or 2. + /// + /// Subscript index + /// The float at the given index + public float this[uint index] + { + get + { + return ValueOfIndex(index); + } + } + + /// + /// + internal static Position GetPositionFromPtr(global::System.IntPtr cPtr) + { + Position ret = new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + + /// + /// Constructor + /// + public Position() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Constructor + /// + /// x component + /// y component + /// z component + public Position(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// + /// Constructor + /// + /// Position2D to create this vector from + public Position(Position2D position2d) : this(NDalicPINVOKE.new_Vector3__SWIG_3(Position2D.getCPtr(position2d)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + + + private Position Add(Position rhs) + { + Position ret = new Position(NDalicPINVOKE.Vector3_Add(swigCPtr, Position.getCPtr(rhs)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private Position Subtract(Position rhs) + { + Position ret = new Position(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private Position Multiply(Position rhs) + { + Position ret = new Position(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private Position Multiply(float rhs) + { + Position ret = new Position(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private Position Divide(Position rhs) + { + Position ret = new Position(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private Position Divide(float rhs) + { + Position ret = new Position(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private Position Subtract() + { + Position ret = new Position(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + private float ValueOfIndex(uint index) + { + float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Compare if rhs is equal to + /// + /// The vector to compare + /// Returns true if the two vectors are equal, otherwise false + public bool EqualTo(Position rhs) + { + bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Position.getCPtr(rhs)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// + /// Compare if rhs is not equal to + /// + /// The vector to compare + /// Returns true if the two vectors are not equal, otherwise false + public bool NotEqualTo(Position rhs) + { + bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Position.getCPtr(rhs)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + + /// + /// x component + /// + public float X + { + set + { + NDalicPINVOKE.Vector3_X_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// y component + /// + public float Y + { + set + { + NDalicPINVOKE.Vector3_Y_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// z component + /// + public float Z + { + set + { + NDalicPINVOKE.Vector3_Z_set(swigCPtr, value); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + get + { + float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants. It's 0.0. + /// + public static float ParentOriginTop + { + get + { + float ret = NDalicPINVOKE.ParentOriginTop_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants. It's 1.0. + /// + public static float ParentOriginBottom + { + get + { + float ret = NDalicPINVOKE.ParentOriginBottom_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants. It's 0.0. + /// + public static float ParentOriginLeft + { + get + { + float ret = NDalicPINVOKE.ParentOriginLeft_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants. It's 1.0. + /// + public static float ParentOriginRight + { + get + { + float ret = NDalicPINVOKE.ParentOriginRight_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants. It's 0.5. + /// + public static float ParentOriginMiddle + { + get + { + float ret = NDalicPINVOKE.ParentOriginMiddle_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 0.0, 0.0, 0.5 + /// + public static Position ParentOriginTopLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 0.5, 0.0, 0.5 + /// + public static Position ParentOriginTopCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 1.0, 0.0, 0.5 + /// + public static Position ParentOriginTopRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 0.0, 0.5, 0.5 + /// + public static Position ParentOriginCenterLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 0.0, 0.5, 0.5 + /// + public static Position ParentOriginCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 1.0, 0.5, 0.5 + /// + public static Position ParentOriginCenterRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 0.0f, 1.0f, 0.5f + /// + public static Position ParentOriginBottomLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 0.5, 1.0, 0.5 + /// + public static Position ParentOriginBottomCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// ParentOrigin constants: 1.0, 1.0, 0.5 + /// + public static Position ParentOriginBottomRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.0 + /// + public static float AnchorPointTop + { + get + { + float ret = NDalicPINVOKE.AnchorPointTop_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 1.0 + /// + public static float AnchorPointBottom + { + get + { + float ret = NDalicPINVOKE.AnchorPointBottom_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.0 + /// + public static float AnchorPointLeft + { + get + { + float ret = NDalicPINVOKE.AnchorPointLeft_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 1.0 + /// + public static float AnchorPointRight + { + get + { + float ret = NDalicPINVOKE.AnchorPointRight_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.0 + /// + public static float AnchorPointMiddle + { + get + { + float ret = NDalicPINVOKE.AnchorPointMiddle_get(); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.0, 0.0, 0.5 + /// + public static Position AnchorPointTopLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.5, 0.0, 0.5 + /// + public static Position AnchorPointTopCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 1.0, 0.0, 0.5 + /// + public static Position AnchorPointTopRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.0, 0.5, 0.5 + /// + public static Position AnchorPointCenterLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.5, 0.5, 0.5 + /// + public static Position AnchorPointCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 1.0, 0.5, 0.5 + /// + public static Position AnchorPointCenterRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.0, 1.0, 0.5 + /// + public static Position AnchorPointBottomLeft + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 0.5, 1.0, 0.5 + /// + public static Position AnchorPointBottomCenter + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// AnchorPoint constants: 1.0, 1.0, 0.5 + /// + public static Position AnchorPointBottomRight + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// Constant ( 1.0f, 1.0f, 1.0f ) + /// + public static Position One + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ONE_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Position XAxis + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_XAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Position YAxis + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_YAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Position ZAxis + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Position NegativeXAxis + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_XAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Position NegativeYAxis + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_YAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + internal static Position NegativeZAxis + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_ZAXIS_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// Constant ( 0.0f, 0.0f, 0.0f ) + /// + public static Position Zero + { + get + { + global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZERO_get(); + Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + } + + /// + /// + public static implicit operator Vector3(Position Position) + { + return new Vector3(Position.X, Position.Y, Position.Z); + } - lock(this) { - if (swigCPtr.Handle != global::System.IntPtr.Zero) { - if (swigCMemOwn) { - swigCMemOwn = false; - NDalicPINVOKE.delete_Vector3(swigCPtr); + /// + /// + public static implicit operator Position(Vector3 vec) + { + return new Position(vec.X, vec.Y, vec.Z); } - swigCPtr = new global::System.Runtime.InteropServices.HandleRef(null, global::System.IntPtr.Zero); - } - global::System.GC.SuppressFinalize(this); + } - } - - - /// - /// Addition operator. - /// - /// Vector to add - /// Vector to add - /// A vector containing the result of the addition - public static Position operator+(Position arg1, Position arg2) { - return arg1.Add(arg2); - } - - /// - /// Subtraction operator. - /// - /// Vector to subtract - /// Vector to subtract - /// A vector containing the result of the subtraction - public static Position operator-(Position arg1, Position arg2) { - return arg1.Subtract(arg2); - } - - /// - /// Unary negation operator. - /// - /// Vector to netate - /// A vector containg the negation - public static Position operator-(Position arg1) { - return arg1.Subtract(); - } - - /// - /// Multiplication operator. - /// - /// The vector to multiply - /// The vector to multiply - /// A vector containing the result of the multiplication - public static Position operator*(Position arg1, Position arg2) { - return arg1.Multiply(arg2); - } - - /// - /// Multiplication operator. - /// - /// The vector to multiply - /// The float value to scale the vector - /// A vector containing the result of the scaling - public static Position operator*(Position arg1, float arg2) { - return arg1.Multiply(arg2); - } - - /// - /// Division operator. - /// - /// The vector to divide - /// The vector to divide - /// A vector containing the result of the division - public static Position operator/(Position arg1, Position arg2) { - return arg1.Divide(arg2); - } - - /// - /// Division operator. - /// - /// The vector to divide - /// The float value to scale the vector by - /// A vector containing the result of the scaling - public static Position operator/(Position arg1, float arg2) { - return arg1.Divide(arg2); - } - - - /// - /// Const array subscript operator overload. Should be 0, 1 or 2. - /// - /// Subscript index - /// The float at the given index - public float this[uint index] - { - get + + public struct ParentOrigin { - return ValueOfIndex(index); - } - } - - /// - /// - public static Position GetPositionFromPtr(global::System.IntPtr cPtr) { - Position ret = new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - - /// - /// Constructor - /// - public Position() : this(NDalicPINVOKE.new_Vector3__SWIG_0(), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Constructor - /// - /// x component - /// y component - /// z component - public Position(float x, float y, float z) : this(NDalicPINVOKE.new_Vector3__SWIG_1(x, y, z), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - /// - /// Constructor - /// - /// Position2D to create this vector from - public Position(Position2D position2d) : this(NDalicPINVOKE.new_Vector3__SWIG_3(Position2D.getCPtr(position2d)), true) { - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - - - - private Position Add(Position rhs) { - Position ret = new Position(NDalicPINVOKE.Vector3_Add(swigCPtr, Position.getCPtr(rhs)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private Position Subtract(Position rhs) { - Position ret = new Position(NDalicPINVOKE.Vector3_Subtract__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private Position Multiply(Position rhs) { - Position ret = new Position(NDalicPINVOKE.Vector3_Multiply__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private Position Multiply(float rhs) { - Position ret = new Position(NDalicPINVOKE.Vector3_Multiply__SWIG_1(swigCPtr, rhs), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private Position Divide(Position rhs) { - Position ret = new Position(NDalicPINVOKE.Vector3_Divide__SWIG_0(swigCPtr, Position.getCPtr(rhs)), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private Position Divide(float rhs) { - Position ret = new Position(NDalicPINVOKE.Vector3_Divide__SWIG_1(swigCPtr, rhs), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private Position Subtract() { - Position ret = new Position(NDalicPINVOKE.Vector3_Subtract__SWIG_1(swigCPtr), true); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - private float ValueOfIndex(uint index) { - float ret = NDalicPINVOKE.Vector3_ValueOfIndex__SWIG_0(swigCPtr, index); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Compare if rhs is equal to - /// - /// The vector to compare - /// Returns true if the two vectors are equal, otherwise false - public bool EqualTo(Position rhs) { - bool ret = NDalicPINVOKE.Vector3_EqualTo(swigCPtr, Position.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - /// - /// Compare if rhs is not equal to - /// - /// The vector to compare - /// Returns true if the two vectors are not equal, otherwise false - public bool NotEqualTo(Position rhs) { - bool ret = NDalicPINVOKE.Vector3_NotEqualTo(swigCPtr, Position.getCPtr(rhs)); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - - - /// - /// x component - /// - public float X { - set { - NDalicPINVOKE.Vector3_X_set(swigCPtr, value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - float ret = NDalicPINVOKE.Vector3_X_get(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// y component - /// - public float Y { - set { - NDalicPINVOKE.Vector3_Y_set(swigCPtr, value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - float ret = NDalicPINVOKE.Vector3_Y_get(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// z component - /// - public float Z { - set { - NDalicPINVOKE.Vector3_Z_set(swigCPtr, value); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - } - get { - float ret = NDalicPINVOKE.Vector3_Z_get(swigCPtr); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants. It's 0.0. - /// - public static float ParentOriginTop - { - get - { - float ret = NDalicPINVOKE.ParentOriginTop_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants. It's 1.0. - /// - public static float ParentOriginBottom - { - get - { - float ret = NDalicPINVOKE.ParentOriginBottom_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants. It's 0.0. - /// - public static float ParentOriginLeft - { - get - { - float ret = NDalicPINVOKE.ParentOriginLeft_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants. It's 1.0. - /// - public static float ParentOriginRight - { - get - { - float ret = NDalicPINVOKE.ParentOriginRight_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants. It's 0.5. - /// - public static float ParentOriginMiddle - { - get - { - float ret = NDalicPINVOKE.ParentOriginMiddle_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 0.0, 0.0, 0.5 - /// - public static Position ParentOriginTopLeft - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopLeft_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 0.5, 0.0, 0.5 - /// - public static Position ParentOriginTopCenter - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopCenter_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 1.0, 0.0, 0.5 - /// - public static Position ParentOriginTopRight - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginTopRight_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 0.0, 0.5, 0.5 - /// - public static Position ParentOriginCenterLeft - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterLeft_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 0.0, 0.5, 0.5 - /// - public static Position ParentOriginCenter - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenter_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 1.0, 0.5, 0.5 - /// - public static Position ParentOriginCenterRight - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginCenterRight_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 0.0f, 1.0f, 0.5f - /// - public static Position ParentOriginBottomLeft - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomLeft_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 0.5, 1.0, 0.5 - /// - public static Position ParentOriginBottomCenter - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomCenter_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// ParentOrigin constants: 1.0, 1.0, 0.5 - /// - public static Position ParentOriginBottomRight - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.ParentOriginBottomRight_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.0 - /// - public static float AnchorPointTop - { - get - { - float ret = NDalicPINVOKE.AnchorPointTop_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 1.0 - /// - public static float AnchorPointBottom - { - get - { - float ret = NDalicPINVOKE.AnchorPointBottom_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.0 - /// - public static float AnchorPointLeft - { - get - { - float ret = NDalicPINVOKE.AnchorPointLeft_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 1.0 - /// - public static float AnchorPointRight - { - get - { - float ret = NDalicPINVOKE.AnchorPointRight_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.0 - /// - public static float AnchorPointMiddle - { - get - { - float ret = NDalicPINVOKE.AnchorPointMiddle_get(); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.0, 0.0, 0.5 - /// - public static Position AnchorPointTopLeft - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopLeft_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.5, 0.0, 0.5 - /// - public static Position AnchorPointTopCenter - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopCenter_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 1.0, 0.0, 0.5 - /// - public static Position AnchorPointTopRight - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointTopRight_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.0, 0.5, 0.5 - /// - public static Position AnchorPointCenterLeft - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterLeft_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.5, 0.5, 0.5 - /// - public static Position AnchorPointCenter - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenter_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 1.0, 0.5, 0.5 - /// - public static Position AnchorPointCenterRight - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointCenterRight_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.0, 1.0, 0.5 - /// - public static Position AnchorPointBottomLeft - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomLeft_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 0.5, 1.0, 0.5 - /// - public static Position AnchorPointBottomCenter - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomCenter_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// AnchorPoint constants: 1.0, 1.0, 0.5 - /// - public static Position AnchorPointBottomRight - { - get - { - global::System.IntPtr cPtr = NDalicPINVOKE.AnchorPointBottomRight_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - /// - /// Constant ( 1.0f, 1.0f, 1.0f ) - /// - public static Position One { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ONE_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + public static readonly float Top = Position.ParentOriginTop; + public static readonly float Bottom = Position.ParentOriginBottom; + public static readonly float Left = Position.ParentOriginLeft; + public static readonly float Right = Position.ParentOriginRight; + public static readonly float Middle = Position.ParentOriginMiddle; + public static readonly Position TopLeft = Position.ParentOriginTopLeft; + public static readonly Position TopCenter = Position.ParentOriginTopCenter; + public static readonly Position TopRight = Position.ParentOriginTopRight; + public static readonly Position CenterLeft = Position.ParentOriginCenterLeft; + public static readonly Position Center = Position.ParentOriginCenter; + public static readonly Position CenterRight = Position.ParentOriginCenterRight; + public static readonly Position BottomLeft = Position.ParentOriginBottomLeft; + public static readonly Position BottomCenter = Position.ParentOriginBottomCenter; + public static readonly Position BottomRight = Position.ParentOriginBottomRight; } - } - - internal static Position XAxis { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_XAXIS_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal static Position YAxis { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_YAXIS_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal static Position ZAxis { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZAXIS_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal static Position NegativeXAxis { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_XAXIS_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal static Position NegativeYAxis { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_YAXIS_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; - } - } - - internal static Position NegativeZAxis { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_NEGATIVE_ZAXIS_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + public struct AnchorPoint + { + public static readonly float Top = Position.AnchorPointTop; + public static readonly float Bottom = Position.AnchorPointBottom; + public static readonly float Left = Position.AnchorPointLeft; + public static readonly float Right = Position.AnchorPointRight; + public static readonly float Middle = Position.AnchorPointMiddle; + public static readonly Position TopLeft = Position.AnchorPointTopLeft; + public static readonly Position TopCenter = Position.AnchorPointTopCenter; + public static readonly Position TopRight = Position.AnchorPointTopRight; + public static readonly Position CenterLeft = Position.AnchorPointCenterLeft; + public static readonly Position Center = Position.AnchorPointCenter; + public static readonly Position CenterRight = Position.AnchorPointCenterRight; + public static readonly Position BottomLeft = Position.AnchorPointBottomLeft; + public static readonly Position BottomCenter = Position.AnchorPointBottomCenter; + public static readonly Position BottomRight = Position.AnchorPointBottomRight; } - } - - /// - /// Constant ( 0.0f, 0.0f, 0.0f ) - /// - public static Position Zero { - get { - global::System.IntPtr cPtr = NDalicPINVOKE.Vector3_ZERO_get(); - Position ret = (cPtr == global::System.IntPtr.Zero) ? null : new Position(cPtr, false); - if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); - return ret; + public struct PositionAxis + { + public static readonly Position X = Position.XAxis; + public static readonly Position Y = Position.YAxis; + public static readonly Position Z = Position.ZAxis; + public static readonly Position NegativeX = Position.NegativeXAxis; + public static readonly Position NegativeY = Position.NegativeYAxis; + public static readonly Position NegativeZ = Position.NegativeZAxis; } - } - - /// - /// - public static implicit operator Vector3(Position Position) - { - return new Vector3(Position.X, Position.Y, Position.Z); - } - - /// - /// - public static implicit operator Position(Vector3 vec) - { - return new Position(vec.X, vec.Y, vec.Z); - } - -} - - public struct ParentOrigin - { - public static readonly float Top = Position.ParentOriginTop; - public static readonly float Bottom = Position.ParentOriginBottom; - public static readonly float Left = Position.ParentOriginLeft; - public static readonly float Right = Position.ParentOriginRight; - public static readonly float Middle = Position.ParentOriginMiddle; - public static readonly Position TopLeft = Position.ParentOriginTopLeft; - public static readonly Position TopCenter = Position.ParentOriginTopCenter; - public static readonly Position TopRight = Position.ParentOriginTopRight; - public static readonly Position CenterLeft = Position.ParentOriginCenterLeft; - public static readonly Position Center = Position.ParentOriginCenter; - public static readonly Position CenterRight = Position.ParentOriginCenterRight; - public static readonly Position BottomLeft = Position.ParentOriginBottomLeft; - public static readonly Position BottomCenter = Position.ParentOriginBottomCenter; - public static readonly Position BottomRight = Position.ParentOriginBottomRight; - } - public struct AnchorPoint - { - public static readonly float Top = Position.AnchorPointTop; - public static readonly float Bottom = Position.AnchorPointBottom; - public static readonly float Left = Position.AnchorPointLeft; - public static readonly float Right = Position.AnchorPointRight; - public static readonly float Middle = Position.AnchorPointMiddle; - public static readonly Position TopLeft = Position.AnchorPointTopLeft; - public static readonly Position TopCenter = Position.AnchorPointTopCenter; - public static readonly Position TopRight = Position.AnchorPointTopRight; - public static readonly Position CenterLeft = Position.AnchorPointCenterLeft; - public static readonly Position Center = Position.AnchorPointCenter; - public static readonly Position CenterRight = Position.AnchorPointCenterRight; - public static readonly Position BottomLeft = Position.AnchorPointBottomLeft; - public static readonly Position BottomCenter = Position.AnchorPointBottomCenter; - public static readonly Position BottomRight = Position.AnchorPointBottomRight; - } - public struct PositionAxis - { - public static readonly Position X = Position.XAxis; - public static readonly Position Y = Position.YAxis; - public static readonly Position Z = Position.ZAxis; - public static readonly Position NegativeX = Position.NegativeXAxis; - public static readonly Position NegativeY = Position.NegativeYAxis; - public static readonly Position NegativeZ = Position.NegativeZAxis; - } } diff --git a/Tizen.NUI/src/public/Position2D.cs b/Tizen.NUI/src/public/Position2D.cs index 9fe88f4..4c3ee39 100755 --- a/Tizen.NUI/src/public/Position2D.cs +++ b/Tizen.NUI/src/public/Position2D.cs @@ -89,7 +89,7 @@ public class Position2D : global::System.IDisposable { } } - public static Position2D GetPosition2DFromPtr(global::System.IntPtr cPtr) { + internal static Position2D GetPosition2DFromPtr(global::System.IntPtr cPtr) { Position2D ret = new Position2D(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); return ret; diff --git a/Tizen.NUI/src/public/ProgressBar.cs b/Tizen.NUI/src/public/ProgressBar.cs index 2417bdf..2c7353c 100755 --- a/Tizen.NUI/src/public/ProgressBar.cs +++ b/Tizen.NUI/src/public/ProgressBar.cs @@ -173,7 +173,7 @@ namespace Tizen.NUI /// /// - public static ProgressBar GetProgressBarFromPtr(global::System.IntPtr cPtr) + internal static ProgressBar GetProgressBarFromPtr(global::System.IntPtr cPtr) { ProgressBar ret = new ProgressBar(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/Size.cs b/Tizen.NUI/src/public/Size.cs index 68a217e..395302d 100755 --- a/Tizen.NUI/src/public/Size.cs +++ b/Tizen.NUI/src/public/Size.cs @@ -157,12 +157,7 @@ namespace Tizen.NUI } } - /// - /// Get Size from pointer. - /// - /// Pointer of the Size - /// Size - public static Size GetSizeFromPtr(global::System.IntPtr cPtr) + internal static Size GetSizeFromPtr(global::System.IntPtr cPtr) { Size ret = new Size(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/Size2D.cs b/Tizen.NUI/src/public/Size2D.cs index d93f352..abb45eb 100755 --- a/Tizen.NUI/src/public/Size2D.cs +++ b/Tizen.NUI/src/public/Size2D.cs @@ -163,7 +163,7 @@ namespace Tizen.NUI /// /// Pointer of the Size /// Size - public static Size2D GetSize2DFromPtr(global::System.IntPtr cPtr) + internal static Size2D GetSize2DFromPtr(global::System.IntPtr cPtr) { Size2D ret = new Size2D(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/Slider.cs b/Tizen.NUI/src/public/Slider.cs index 5a9d145..06ba997 100755 --- a/Tizen.NUI/src/public/Slider.cs +++ b/Tizen.NUI/src/public/Slider.cs @@ -342,7 +342,7 @@ namespace Tizen.NUI /// /// The pointer of Slider /// Object of Slider type - public static Slider GetSliderFromPtr(global::System.IntPtr cPtr) + internal static Slider GetSliderFromPtr(global::System.IntPtr cPtr) { Slider ret = new Slider(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/TapGesture.cs b/Tizen.NUI/src/public/TapGesture.cs index f30d45c..a164c36 100755 --- a/Tizen.NUI/src/public/TapGesture.cs +++ b/Tizen.NUI/src/public/TapGesture.cs @@ -66,7 +66,7 @@ namespace Tizen.NUI /// /// The pointer to cast /// TapGesture object - public static TapGesture GetTapGestureFromPtr(global::System.IntPtr cPtr) + internal static TapGesture GetTapGestureFromPtr(global::System.IntPtr cPtr) { TapGesture ret = new TapGesture(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); diff --git a/Tizen.NUI/src/public/View.cs b/Tizen.NUI/src/public/View.cs index b96f474..7934aeb 100755 --- a/Tizen.NUI/src/public/View.cs +++ b/Tizen.NUI/src/public/View.cs @@ -588,7 +588,7 @@ namespace Tizen.NUI - public static View GetViewFromPtr(global::System.IntPtr cPtr) + internal static View GetViewFromPtr(global::System.IntPtr cPtr) { View ret = new View(cPtr, false); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -891,10 +891,10 @@ namespace Tizen.NUI Tizen.NUI.PropertyMap background = Background; int visualType = 0; - background.Find(Tizen.NUI.Constants.Visual.Property.Type).Get(ref visualType); - if (visualType == (int)Tizen.NUI.Constants.Visual.Type.Color) + background.Find(Visual.Property.Type).Get(ref visualType); + if (visualType == (int)Visual.Type.Color) { - background.Find(Tizen.NUI.Constants.ColorVisualProperty.MixColor).Get(backgroundColor); + background.Find(ColorVisualProperty.MixColor).Get(backgroundColor); } return backgroundColor; @@ -916,10 +916,10 @@ namespace Tizen.NUI Tizen.NUI.PropertyMap background = Background; int visualType = 0; - background.Find(Tizen.NUI.Constants.Visual.Property.Type).Get(ref visualType); - if (visualType == (int)Tizen.NUI.Constants.Visual.Type.Image) + background.Find(Visual.Property.Type).Get(ref visualType); + if (visualType == (int)Visual.Type.Image) { - background.Find(Tizen.NUI.Constants.ImageVisualProperty.URL).Get(out backgroundImage); + background.Find(ImageVisualProperty.URL).Get(out backgroundImage); } return backgroundImage; diff --git a/Tizen.NUI/src/public/VisualMaps.cs b/Tizen.NUI/src/public/VisualMaps.cs index 5b92c74..2a1b65d 100755 --- a/Tizen.NUI/src/public/VisualMaps.cs +++ b/Tizen.NUI/src/public/VisualMaps.cs @@ -25,10 +25,10 @@ namespace Tizen.NUI { private Vector2 _visualSize = Vector2.Zero; private Vector2 _visualOffset = Vector2.Zero; - private Vector2 _visualOffsetPolicy = new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE); // default absolute - private Vector2 _visualSizePolicy = new Vector2((int)VisualTransformPolicyType.ABSOLUTE, (int)VisualTransformPolicyType.ABSOLUTE); // default absolute - private AlignType _visualOrigin = AlignType.TOP_BEGIN; - private AlignType _visualAnchorPoint = AlignType.TOP_BEGIN; + private Vector2 _visualOffsetPolicy = new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute); // default absolute + private Vector2 _visualSizePolicy = new Vector2((int)VisualTransformPolicyType.Absolute, (int)VisualTransformPolicyType.Absolute); // default absolute + private AlignType _visualOrigin = AlignType.TopBegin; + private AlignType _visualAnchorPoint = AlignType.TopBegin; private PropertyMap _visualTransformMap = null; @@ -159,12 +159,12 @@ namespace Tizen.NUI if (_visualSize != Vector2.Zero) { _visualTransformMap = new PropertyMap(); - _visualTransformMap.Add((int)VisualTransformPropertyType.SIZE, new PropertyValue(_visualSize)); - _visualTransformMap.Add((int)VisualTransformPropertyType.OFFSET, new PropertyValue(_visualOffset)); - _visualTransformMap.Add((int)VisualTransformPropertyType.OFFSET_POLICY, new PropertyValue(_visualOffsetPolicy)); - _visualTransformMap.Add((int)VisualTransformPropertyType.SIZE_POLICY, new PropertyValue(_visualSizePolicy)); - _visualTransformMap.Add((int)VisualTransformPropertyType.ORIGIN, new PropertyValue((int)_visualOrigin)); - _visualTransformMap.Add((int)VisualTransformPropertyType.ANCHOR_POINT, new PropertyValue((int)_visualAnchorPoint)); + _visualTransformMap.Add((int)VisualTransformPropertyType.Size, new PropertyValue(_visualSize)); + _visualTransformMap.Add((int)VisualTransformPropertyType.Offset, new PropertyValue(_visualOffset)); + _visualTransformMap.Add((int)VisualTransformPropertyType.OffsetPolicy, new PropertyValue(_visualOffsetPolicy)); + _visualTransformMap.Add((int)VisualTransformPropertyType.SizePolicy, new PropertyValue(_visualSizePolicy)); + _visualTransformMap.Add((int)VisualTransformPropertyType.Origin, new PropertyValue((int)_visualOrigin)); + _visualTransformMap.Add((int)VisualTransformPropertyType.AnchorPoint, new PropertyValue((int)_visualAnchorPoint)); } } @@ -396,26 +396,26 @@ namespace Tizen.NUI if (_url != "") { _outputVisualMap = new PropertyMap(); - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Image)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.URL, new PropertyValue(_url)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.FittingMode, new PropertyValue((int)_fittingMode)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.SamplingMode, new PropertyValue((int)_samplingMode)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Image)); + _outputVisualMap.Add(ImageVisualProperty.URL, new PropertyValue(_url)); + _outputVisualMap.Add(ImageVisualProperty.FittingMode, new PropertyValue((int)_fittingMode)); + _outputVisualMap.Add(ImageVisualProperty.SamplingMode, new PropertyValue((int)_samplingMode)); if (_desiredWidth != 0) { - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.DesiredWidth, new PropertyValue(_desiredWidth)); + _outputVisualMap.Add(ImageVisualProperty.DesiredWidth, new PropertyValue(_desiredWidth)); } if (_desiredHeight != 0) { - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.DesiredHeight, new PropertyValue(_desiredHeight)); + _outputVisualMap.Add(ImageVisualProperty.DesiredHeight, new PropertyValue(_desiredHeight)); } - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.SynchronousLoading, new PropertyValue(_synchronousLoading)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.BorderOnly, new PropertyValue(_borderOnly)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.PixelArea, new PropertyValue(_pixelArea)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.WrapModeU, new PropertyValue((int)_wrapModeU)); - _outputVisualMap.Add(Tizen.NUI.Constants.ImageVisualProperty.WrapModeV, new PropertyValue((int)_wrapModeV)); + _outputVisualMap.Add(ImageVisualProperty.SynchronousLoading, new PropertyValue(_synchronousLoading)); + _outputVisualMap.Add(ImageVisualProperty.BorderOnly, new PropertyValue(_borderOnly)); + _outputVisualMap.Add(ImageVisualProperty.PixelArea, new PropertyValue(_pixelArea)); + _outputVisualMap.Add(ImageVisualProperty.WrapModeU, new PropertyValue((int)_wrapModeU)); + _outputVisualMap.Add(ImageVisualProperty.WrapModeV, new PropertyValue((int)_wrapModeV)); } } } @@ -581,29 +581,29 @@ namespace Tizen.NUI if (_text != "") { _outputVisualMap = new PropertyMap(); - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Text)); - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.Text, new PropertyValue(_text)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Text)); + _outputVisualMap.Add(TextVisualProperty.Text, new PropertyValue(_text)); if (_fontFamily != "") { - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.FontFamily, new PropertyValue(_fontFamily)); + _outputVisualMap.Add(TextVisualProperty.FontFamily, new PropertyValue(_fontFamily)); } if (_fontStyle != null) { - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.FontStyle, new PropertyValue(_fontStyle)); + _outputVisualMap.Add(TextVisualProperty.FontStyle, new PropertyValue(_fontStyle)); } if (_pointSize != 0) { - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.PointSize, new PropertyValue(_pointSize)); + _outputVisualMap.Add(TextVisualProperty.PointSize, new PropertyValue(_pointSize)); } - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.MultiLine, new PropertyValue(_multiLine)); - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.HorizontalAlignment, new PropertyValue(_horizontalAlignment)); - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.VerticalAlignment, new PropertyValue(_verticalAlignment)); - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.TextColor, new PropertyValue(_textColor)); - _outputVisualMap.Add(Tizen.NUI.Constants.TextVisualProperty.EnableMarkup, new PropertyValue(_enableMarkup)); + _outputVisualMap.Add(TextVisualProperty.MultiLine, new PropertyValue(_multiLine)); + _outputVisualMap.Add(TextVisualProperty.HorizontalAlignment, new PropertyValue(_horizontalAlignment)); + _outputVisualMap.Add(TextVisualProperty.VerticalAlignment, new PropertyValue(_verticalAlignment)); + _outputVisualMap.Add(TextVisualProperty.TextColor, new PropertyValue(_textColor)); + _outputVisualMap.Add(TextVisualProperty.EnableMarkup, new PropertyValue(_enableMarkup)); } } } @@ -672,10 +672,10 @@ namespace Tizen.NUI if (_size > 0.000001f) { _outputVisualMap = new PropertyMap(); - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Border)); - _outputVisualMap.Add(Tizen.NUI.Constants.BorderVisualProperty.Color, new PropertyValue(_color)); - _outputVisualMap.Add(Tizen.NUI.Constants.BorderVisualProperty.Size, new PropertyValue(_size)); - _outputVisualMap.Add(Tizen.NUI.Constants.BorderVisualProperty.AntiAliasing, new PropertyValue(_antiAliasing)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Border)); + _outputVisualMap.Add(BorderVisualProperty.Color, new PropertyValue(_color)); + _outputVisualMap.Add(BorderVisualProperty.Size, new PropertyValue(_size)); + _outputVisualMap.Add(BorderVisualProperty.AntiAliasing, new PropertyValue(_antiAliasing)); } } } @@ -709,8 +709,8 @@ namespace Tizen.NUI protected override void ComposingPropertyMap() { _outputVisualMap = new PropertyMap(); - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Color)); - _outputVisualMap.Add(Tizen.NUI.Constants.ColorVisualProperty.MixColor, new PropertyValue(_mixColor)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Color)); + _outputVisualMap.Add(ColorVisualProperty.MixColor, new PropertyValue(_mixColor)); } } @@ -868,20 +868,20 @@ namespace Tizen.NUI && _radius > 0.000001f && _stopColor != null) { _outputVisualMap = new PropertyMap(); - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Gradient)); - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.StartPosition, new PropertyValue(_startPosition)); - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.EndPosition, new PropertyValue(_endPosition)); - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.Center, new PropertyValue(_center)); - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.Radius, new PropertyValue(_radius)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Gradient)); + _outputVisualMap.Add(GradientVisualProperty.StartPosition, new PropertyValue(_startPosition)); + _outputVisualMap.Add(GradientVisualProperty.EndPosition, new PropertyValue(_endPosition)); + _outputVisualMap.Add(GradientVisualProperty.Center, new PropertyValue(_center)); + _outputVisualMap.Add(GradientVisualProperty.Radius, new PropertyValue(_radius)); if (_stopOffset != null) { - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.StopOffset, new PropertyValue(_stopOffset)); + _outputVisualMap.Add(GradientVisualProperty.StopOffset, new PropertyValue(_stopOffset)); } - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.StopColor, new PropertyValue(_stopColor)); - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.Units, new PropertyValue((int)_units)); - _outputVisualMap.Add(Tizen.NUI.Constants.GradientVisualProperty.SpreadMethod, new PropertyValue((int)_spreadMethod)); + _outputVisualMap.Add(GradientVisualProperty.StopColor, new PropertyValue(_stopColor)); + _outputVisualMap.Add(GradientVisualProperty.Units, new PropertyValue((int)_units)); + _outputVisualMap.Add(GradientVisualProperty.SpreadMethod, new PropertyValue((int)_spreadMethod)); } } } @@ -1022,22 +1022,22 @@ namespace Tizen.NUI if (_objectURL != "") { _outputVisualMap = new PropertyMap(); - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Mesh)); - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.ObjectURL, new PropertyValue(_objectURL)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Mesh)); + _outputVisualMap.Add(MeshVisualProperty.ObjectURL, new PropertyValue(_objectURL)); if (_materialtURL != "" && _texturesPath != "") { - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.MaterialtURL, new PropertyValue(_materialtURL)); - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.TexturesPath, new PropertyValue(_texturesPath)); + _outputVisualMap.Add(MeshVisualProperty.MaterialtURL, new PropertyValue(_materialtURL)); + _outputVisualMap.Add(MeshVisualProperty.TexturesPath, new PropertyValue(_texturesPath)); } - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.ShadingMode, new PropertyValue((int)_shadingMode)); - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.UseMipmapping, new PropertyValue(_useMipmapping)); - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.UseSoftNormals, new PropertyValue(_useSoftNormals)); + _outputVisualMap.Add(MeshVisualProperty.ShadingMode, new PropertyValue((int)_shadingMode)); + _outputVisualMap.Add(MeshVisualProperty.UseMipmapping, new PropertyValue(_useMipmapping)); + _outputVisualMap.Add(MeshVisualProperty.UseSoftNormals, new PropertyValue(_useSoftNormals)); if (_lightPosition != null) { - _outputVisualMap.Add(Tizen.NUI.Constants.MeshVisualProperty.LightPosition, new PropertyValue(_lightPosition)); + _outputVisualMap.Add(MeshVisualProperty.LightPosition, new PropertyValue(_lightPosition)); } } } @@ -1293,22 +1293,22 @@ namespace Tizen.NUI protected override void ComposingPropertyMap() { _outputVisualMap = new PropertyMap(); ; - _outputVisualMap.Add(Tizen.NUI.Constants.Visual.Property.Type, new PropertyValue((int)Tizen.NUI.Constants.Visual.Type.Primitive)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.Shape, new PropertyValue((int)_shape)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.MixColor, new PropertyValue(_mixColor)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.Slices, new PropertyValue(_slices)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.Stacks, new PropertyValue(_stacks)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.ScaleTopRadius, new PropertyValue(_scaleTopRadius)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.ScaleBottomRadius, new PropertyValue(_scaleBottomRadius)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.ScaleHeight, new PropertyValue(_scaleHeight)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.ScaleRadius, new PropertyValue(_scaleRadius)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.ScaleDimensions, new PropertyValue(_scaleDimensions)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.BevelPercentage, new PropertyValue(_bevelPercentage)); - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.BevelSmoothness, new PropertyValue(_bevelSmoothness)); + _outputVisualMap.Add(Visual.Property.Type, new PropertyValue((int)Visual.Type.Primitive)); + _outputVisualMap.Add(PrimitiveVisualProperty.Shape, new PropertyValue((int)_shape)); + _outputVisualMap.Add(PrimitiveVisualProperty.MixColor, new PropertyValue(_mixColor)); + _outputVisualMap.Add(PrimitiveVisualProperty.Slices, new PropertyValue(_slices)); + _outputVisualMap.Add(PrimitiveVisualProperty.Stacks, new PropertyValue(_stacks)); + _outputVisualMap.Add(PrimitiveVisualProperty.ScaleTopRadius, new PropertyValue(_scaleTopRadius)); + _outputVisualMap.Add(PrimitiveVisualProperty.ScaleBottomRadius, new PropertyValue(_scaleBottomRadius)); + _outputVisualMap.Add(PrimitiveVisualProperty.ScaleHeight, new PropertyValue(_scaleHeight)); + _outputVisualMap.Add(PrimitiveVisualProperty.ScaleRadius, new PropertyValue(_scaleRadius)); + _outputVisualMap.Add(PrimitiveVisualProperty.ScaleDimensions, new PropertyValue(_scaleDimensions)); + _outputVisualMap.Add(PrimitiveVisualProperty.BevelPercentage, new PropertyValue(_bevelPercentage)); + _outputVisualMap.Add(PrimitiveVisualProperty.BevelSmoothness, new PropertyValue(_bevelSmoothness)); if (_lightPosition != null) { - _outputVisualMap.Add(Tizen.NUI.Constants.PrimitiveVisualProperty.LightPosition, new PropertyValue(_lightPosition)); + _outputVisualMap.Add(PrimitiveVisualProperty.LightPosition, new PropertyValue(_lightPosition)); } } } @@ -1372,4 +1372,145 @@ namespace Tizen.NUI DontCare } + public enum VisualTransformPolicyType + { + Relative = 0, + Absolute = 1 + } + + public enum AlignType + { + TopBegin = 0, + TopCenter, + TopEnd, + CenterBegin, + Center, + CenterEnd, + BottomBegin, + BottomCenter, + BottomEnd + } + + public enum VisualTransformPropertyType + { + Offset, + Size, + Origin, + AnchorPoint, + OffsetPolicy, + SizePolicy + } + + public struct Visual + { + public enum Type + { + Border, + Color, + Gradient, + Image, + Mesh, + Primitive, + Wireframe, + Text + } + + public struct Property + { + public static readonly int Type = NDalic.VISUAL_PROPERTY_TYPE; + public static readonly int Shader = NDalic.VISUAL_PROPERTY_SHADER; + public static readonly int Transform = NDalic.VISUAL_PROPERTY_TRANSFORM; + public static readonly int PremultipliedAlpha = NDalic.VISUAL_PROPERTY_PREMULTIPLIED_ALPHA; + public static readonly int MixColor = NDalic.VISUAL_PROPERTY_MIX_COLOR; + } + + public struct ShaderProperty + { + public static readonly int VertexShader = NDalic.VISUAL_SHADER_VERTEX; + public static readonly int FragmentShader = NDalic.VISUAL_SHADER_FRAGMENT; + public static readonly int ShaderSubdivideGridX = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_X; + public static readonly int ShaderSubdivideGridY = NDalic.VISUAL_SHADER_SUBDIVIDE_GRID_Y; + public static readonly int ShaderHints = NDalic.VISUAL_SHADER_HINTS; + } + } + + public struct BorderVisualProperty + { + public static readonly int Color = NDalic.BORDER_VISUAL_COLOR; + public static readonly int Size = NDalic.BORDER_VISUAL_SIZE; + public static readonly int AntiAliasing = NDalic.BORDER_VISUAL_ANTI_ALIASING; + } + + public struct ColorVisualProperty + { + public static readonly int MixColor = NDalic.COLOR_VISUAL_MIX_COLOR; + } + + public struct GradientVisualProperty + { + public static readonly int StartPosition = NDalic.GRADIENT_VISUAL_START_POSITION; + public static readonly int EndPosition = NDalic.GRADIENT_VISUAL_END_POSITION; + public static readonly int Center = NDalic.GRADIENT_VISUAL_CENTER; + public static readonly int Radius = NDalic.GRADIENT_VISUAL_RADIUS; + public static readonly int StopOffset = NDalic.GRADIENT_VISUAL_STOP_OFFSET; + public static readonly int StopColor = NDalic.GRADIENT_VISUAL_STOP_COLOR; + public static readonly int Units = NDalic.GRADIENT_VISUAL_UNITS; + public static readonly int SpreadMethod = NDalic.GRADIENT_VISUAL_SPREAD_METHOD; + } + + public struct ImageVisualProperty + { + public static readonly int URL = NDalic.IMAGE_VISUAL_URL; + public static readonly int FittingMode = NDalic.IMAGE_VISUAL_FITTING_MODE; + public static readonly int SamplingMode = NDalic.IMAGE_VISUAL_SAMPLING_MODE; + public static readonly int DesiredWidth = NDalic.IMAGE_VISUAL_DESIRED_WIDTH; + public static readonly int DesiredHeight = NDalic.IMAGE_VISUAL_DESIRED_HEIGHT; + public static readonly int SynchronousLoading = NDalic.IMAGE_VISUAL_SYNCHRONOUS_LOADING; + public static readonly int BorderOnly = NDalic.IMAGE_VISUAL_BORDER_ONLY; + public static readonly int PixelArea = NDalic.IMAGE_VISUAL_PIXEL_AREA; + public static readonly int WrapModeU = NDalic.IMAGE_VISUAL_WRAP_MODE_U; + public static readonly int WrapModeV = NDalic.IMAGE_VISUAL_WRAP_MODE_V; + } + + public struct MeshVisualProperty + { + public static readonly int ObjectURL = NDalic.MESH_VISUAL_OBJECT_URL; + public static readonly int MaterialtURL = NDalic.MESH_VISUAL_MATERIAL_URL; + public static readonly int TexturesPath = NDalic.MESH_VISUAL_TEXTURES_PATH; + public static readonly int ShadingMode = NDalic.MESH_VISUAL_SHADING_MODE; + public static readonly int UseMipmapping = NDalic.MESH_VISUAL_USE_MIPMAPPING; + public static readonly int UseSoftNormals = NDalic.MESH_VISUAL_USE_SOFT_NORMALS; + public static readonly int LightPosition = NDalic.MESH_VISUAL_LIGHT_POSITION; + } + + public struct PrimitiveVisualProperty + { + public static readonly int Shape = NDalic.PRIMITIVE_VISUAL_SHAPE; + public static readonly int MixColor = NDalic.PRIMITIVE_VISUAL_MIX_COLOR; + public static readonly int Slices = NDalic.PRIMITIVE_VISUAL_SLICES; + public static readonly int Stacks = NDalic.PRIMITIVE_VISUAL_STACKS; + public static readonly int ScaleTopRadius = NDalic.PRIMITIVE_VISUAL_SCALE_TOP_RADIUS; + public static readonly int ScaleBottomRadius = NDalic.PRIMITIVE_VISUAL_SCALE_BOTTOM_RADIUS; + public static readonly int ScaleHeight = NDalic.PRIMITIVE_VISUAL_SCALE_HEIGHT; + public static readonly int ScaleRadius = NDalic.PRIMITIVE_VISUAL_SCALE_RADIUS; + public static readonly int ScaleDimensions = NDalic.PRIMITIVE_VISUAL_SCALE_DIMENSIONS; + public static readonly int BevelPercentage = NDalic.PRIMITIVE_VISUAL_BEVEL_PERCENTAGE; + public static readonly int BevelSmoothness = NDalic.PRIMITIVE_VISUAL_BEVEL_SMOOTHNESS; + public static readonly int LightPosition = NDalic.PRIMITIVE_VISUAL_LIGHT_POSITION; + } + + public struct TextVisualProperty + { + public static readonly int Text = NDalic.TEXT_VISUAL_TEXT; + public static readonly int FontFamily = NDalic.TEXT_VISUAL_FONT_FAMILY; + public static readonly int FontStyle = NDalic.TEXT_VISUAL_FONT_STYLE; + public static readonly int PointSize = NDalic.TEXT_VISUAL_POINT_SIZE; + public static readonly int MultiLine = NDalic.TEXT_VISUAL_MULTI_LINE; + public static readonly int HorizontalAlignment = NDalic.TEXT_VISUAL_HORIZONTAL_ALIGNMENT; + public static readonly int VerticalAlignment = NDalic.TEXT_VISUAL_VERTICAL_ALIGNMENT; + public static readonly int TextColor = NDalic.TEXT_VISUAL_TEXT_COLOR; + public static readonly int EnableMarkup = NDalic.TEXT_VISUAL_ENABLE_MARKUP; + } + + } diff --git a/Tizen.NUI/src/public/Window.cs b/Tizen.NUI/src/public/Window.cs index a8c0d17..623ebe6 100755 --- a/Tizen.NUI/src/public/Window.cs +++ b/Tizen.NUI/src/public/Window.cs @@ -136,7 +136,7 @@ namespace Tizen.NUI /// This sets whether the indicator bar should be shown or not. /// /// Visible mode for indicator bar, Visible in default - public void ShowIndicator(Window.IndicatorVisibleMode visibleMode) + internal void ShowIndicator(Window.IndicatorVisibleMode visibleMode) { NDalicPINVOKE.Window_ShowIndicator(swigCPtr, (int)visibleMode); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -146,7 +146,7 @@ namespace Tizen.NUI /// This sets the opacity mode of indicator bar. /// /// The opacity mode - public void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity) + internal void SetIndicatorBgOpacity(Window.IndicatorBgOpacity opacity) { NDalicPINVOKE.Window_SetIndicatorBgOpacity(swigCPtr, (int)opacity); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -157,7 +157,7 @@ namespace Tizen.NUI /// It does not implicitly show the indicator if it is currently hidden. /// /// The orientation - public void RotateIndicator(Window.WindowOrientation orientation) + internal void RotateIndicator(Window.WindowOrientation orientation) { NDalicPINVOKE.Window_RotateIndicator(swigCPtr, (int)orientation); if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); @@ -256,7 +256,7 @@ namespace Tizen.NUI /// /// Enumeration for opacity of the indicator. /// - public enum IndicatorBgOpacity + internal enum IndicatorBgOpacity { Opaque = 100, Translucent = 50, @@ -266,7 +266,7 @@ namespace Tizen.NUI /// /// Enumeration for visible mode of the indicator. /// - public enum IndicatorVisibleMode + internal enum IndicatorVisibleMode { Invisible = 0, Visible = 1,