From 2c66cbc9faf382b956b27b09c3577f35b025a407 Mon Sep 17 00:00:00 2001 From: "dongsug.song" Date: Tue, 27 Jun 2017 21:24:21 +0900 Subject: [PATCH] Size2D get error fix - add Size's set/get Property - fix compile error for NUI Ubuntu build with VS-Code (please use NUISamplesUbuntu) Conflicts: NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs Change-Id: Id9e64b0915b32e2470104403f62719fe75e84aa7 Signed-off-by: dongsug.song --- .../NUISamples/NUISamples.TizenTV/examples/Main.cs | 44 +++++++++---------- .../examples/as-is-test-sample.cs | 49 ++++++++++++++++++---- .../examples/control-dashboard.cs | 10 +++-- .../NUISamples.TizenTV/examples/custom-control.cs | 4 +- .../NUISamples.TizenTV/examples/dali-test.cs | 9 ++-- .../date-picker-using-json.cs | 7 +++- .../NUISamples.TizenTV/examples/date-picker.cs | 2 +- .../NUISamples.TizenTV/examples/flex-container.cs | 2 +- .../NUISamples.TizenTV/examples/gc-test.cs | 34 +++++++++------ .../NUISamples.TizenTV/examples/hello-world.cs | 2 +- .../NUISamples.TizenTV/examples/image-view.cs | 6 +-- .../NUISamples.TizenTV/examples/scroll-view.cs | 6 +-- .../examples/user-alphafunction.cs | 6 +-- .../examples/view-navi-property.cs | 2 +- .../examples/visual-animation-test.cs | 3 +- .../examples/visual-animation-test3.cs | 3 +- .../examples/visual-view-test.cs | 2 +- .../examples/visual-view-test2.cs | 4 +- .../examples/visual-view-test3.cs | 2 +- .../NUISamples.TizenTV/examples/visuals-example.cs | 2 +- src/Tizen.NUI/src/public/Property.cs | 20 +++++++++ 21 files changed, 144 insertions(+), 75 deletions(-) mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs mode change 100644 => 100755 NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs index fbfe45f..17ca5fb 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/Main.cs @@ -14,32 +14,32 @@ namespace NUISamples.TizenTV.examples [STAThread] static void Main(string[] args) { - //new ControlDashboard.Example().Run(args); //o - //new DatePickerTest.Example().Run(args); //o - //new DatePickerUsingJson.Example().Run(args); //o - // new HelloTest.Example().Run(args); //o - // new HelloWorldTest.Example().Run(args); //o - // new Test1.Example().Run(args); //o - //new SiblingOrderTest.Example().Run(args); //o - //new UserAlphaFunctionTest.Example().Run(args); //o - //new MyCSharpExample.Example().Run(args); //o - //new CustomControlTest.Example().Run(args); //o - //new ScrollViewTest.Example().Run(args); //o - //new ImageViewTest.Example().Run(args); //o - //new FlexContainerTest.SampleMain().Run(args); //o - //new DaliTest.Example().Run(args); //o + //new ControlDashboard.Example().Run(args); + //new DatePickerTest.Example().Run(args); + //new DatePickerUsingJson.Example().Run(args); + //new HelloTest.Example().Run(args); + //new HelloWorldTest.Example().Run(args); + //new Test1.Example().Run(args); + //new SiblingOrderTest.Example().Run(args); + //new UserAlphaFunctionTest.Example().Run(args); + //new MyCSharpExample.Example().Run(args); + //new CustomControlTest.Example().Run(args); + //new ScrollViewTest.Example().Run(args); + //new ImageViewTest.Example().Run(args); + //new FlexContainerTest.SampleMain().Run(args); + //new DaliTest.Example().Run(args); //new RelativeVectorTest.Example().Run(args); //new VisaulAnimationExample.Example().Run(args); - // new VisaulAnimationExample.Example2().Run(args); //o - new VisaulAnimationExample.Example3().Run(args); //o - //new VisualViewTest.Example().Run(args); //o + //new VisaulAnimationExample.Example2().Run(args); + //new VisaulAnimationExample.Example3().Run(args); + //new VisualViewTest.Example().Run(args); //new VisualViewTest2.VisualSample().Run(args); - //new VisualViewTest3.Example().Run(args); //o - //new VisualsUsingCustomView.VisualsExample().Run(args); //o - //new FirstScreen.FirstScreenApp().Run(args); //o //new PositionUsesPivotPointTest.Example().Run(args); - // new VisualsExampleTest.Example().Run(args); //o - //new TizenSTVUIApplication15.Program().Run(args); + //new VisualViewTest3.Example().Run(args); + //new VisualsUsingCustomView.VisualsExample().Run(args); + //new FirstScreen.FirstScreenApp().Run(args); + //new VisualsExampleTest.Example().Run(args); + new AsIsTest.Example().Run(args); } } } diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs index 3da0a43..f9ea851 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/as-is-test-sample.cs @@ -2,9 +2,9 @@ using System; using Tizen.NUI.BaseComponents; using Tizen.NUI; -namespace TizenSTVUIApplication15 +namespace AsIsTest { - class Program : NUIApplication + class Example : NUIApplication { private Timer myTimer; @@ -24,16 +24,17 @@ namespace TizenSTVUIApplication15 base.OnCreate(); myView = new View(); - myView.Size = new Size(100, 100, 0); + myView.Size2D = new Size2D(100, 100); myView.Position = new Position(100, 100, 0); myView.BackgroundColor = Color.Red; myView.Name = "myView"; + myView.SizeWidth = 111; Window.Instance.GetDefaultLayer().Add(myView); myTextLabel = new TextLabel(); myTextLabel.Position = new Position(100, 100, 0); - myTextLabel.Size = new Size(100, 100, 0); + myTextLabel.Size2D = new Size2D(100, 100); myTextLabel.Name = "myTextLabel"; myView.Add(myTextLabel); @@ -92,7 +93,7 @@ namespace TizenSTVUIApplication15 { Layer myLayer = o as Layer; - for (int i = 0; i < myLayer.GetChildCount(); i++) + for (int i = 0; i < myLayer.ChildCount; i++) { BFS(myLayer.GetChildAt((uint)i), depth + 1); } @@ -105,8 +106,12 @@ namespace TizenSTVUIApplication15 private bool Mytimer_Tick(object source, Timer.TickEventArgs e) { - //ObjectDumpTrigger(); + ObjectDumpTrigger(); ObjectDumpTrigger2(); + Tizen.Log.Debug("NUI", " === Size property set/get test!"); + myView.Size2D.Width += 5; //this is not working, because stage's Size is Vector2 but view's Size is Vector3. need to figure out. + myView.SizeHeight += 5; + Tizen.Log.Debug("NUI", $" view's size width= {myView.Size2D.Width} heigh={myView.Size2D.Height}"); return true; } @@ -143,7 +148,7 @@ namespace TizenSTVUIApplication15 layer.Add(vi2); layer.Add(tb3); - Window.Instance.AddLayer(layer); + Window.Instance.Add(layer); } void ObjectDumpTrigger2() @@ -167,7 +172,7 @@ namespace TizenSTVUIApplication15 Tizen.Log.Fatal("NUI-APP", "### layer is null! just return!"); return; } - uint childCnt = layer.GetChildCount(); + uint childCnt = layer.ChildCount; if (childCnt > 0) { for (uint i = 0; i < childCnt; i++) @@ -199,6 +204,32 @@ namespace TizenSTVUIApplication15 { var temp = view.GetChildAt(i) as View; Tizen.Log.Fatal("NUI-APP", "depth[" + depth + "] child in layer! type=" + temp.GetTypeName() + " AS-IS Test: IsView?=" + (temp is View) + " IsTextLabel?=" + (temp is TextLabel) ); + + if (temp is TextLabel) + { + ToggleButton _toggleBt = temp as ToggleButton; + if(_toggleBt == null) + { + Tizen.Log.Debug("NUI", $"temp is TextLabel! try to do invalid cast! should return null! OK!GOOD!"); + } + else + { + Tizen.Log.Debug("NUI", $"temp is TextLabel! try to do invalid cast! should return null! BAD!ERROR!"); + } + } + else if (temp is ToggleButton) + { + TextLabel _textLb = temp as TextLabel; + if(_textLb == null) + { + Tizen.Log.Debug("NUI", $"temp is ToggleButton! try to do invalid cast! should return null! OK!GOOD!"); + } + else + { + Tizen.Log.Debug("NUI", $"temp is ToggleButton! try to do invalid cast! should return null! BAD!ERROR!"); + } + } + ViewCheckRecurse(temp, depth); } } @@ -217,7 +248,7 @@ namespace TizenSTVUIApplication15 private static void _Main(string[] args) { //Create an Application - Program myProgram = new Program(); + Example myProgram = new Example(); myProgram.Run(args); } } diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs old mode 100644 new mode 100755 index d76e91a..bea0ec6 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs @@ -46,7 +46,9 @@ namespace ControlDashboard private Window _window; private Popup _popup; private ProgressBar _progressBar; - private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + private const string _resPath = "./res"; //for ubuntu + // List of items private Item[] mViewList = { @@ -140,7 +142,7 @@ namespace ControlDashboard { // Make label for item TextLabel itemLabel = new TextLabel(" " + item.name); - itemLabel.Size = new Vector3(_window.Size.Width * 0.2f, _window.Size.Height * 0.05f, 0.0f); + itemLabel.Size2D = new Size2D((int)(_window.Size.Width * 0.2f), (int)(_window.Size.Height * 0.05f)); itemLabel.HorizontalAlignment = HorizontalAlignment.Begin; itemLabel.VerticalAlignment = VerticalAlignment.Bottom; //itemLabel.PointSize = 18.0f; @@ -392,7 +394,7 @@ namespace ControlDashboard else { ImageView notSupportView = new ImageView(_resPath + "/images/not_yet_sign.png"); - notSupportView.Size = new Vector3(_window.Size.Width * 0.2f, _window.Size.Height * 0.25f, 0.0f); + notSupportView.Size2D = new Size2D((int)(_window.Size.Width * 0.2f), (int)(_window.Size.Height * 0.25f)); notSupportView.Focusable = (true); _contentContainer.AddChild(notSupportView, new TableView.CellPosition(((uint)idx / 5) * 2 + 1, (uint)idx % 5)); } @@ -405,7 +407,7 @@ namespace ControlDashboard footer.Name = ("Footer"); footer.WidthResizePolicy = ResizePolicyType.FillToParent; footer.HeightResizePolicy = ResizePolicyType.Fixed; - footer.Size = new Size(0.0f, 80.0f, 0.0f); + footer.Size2D = new Size2D(0, 80); footer.PivotPoint = PivotPoint.Center; PushButton okButton = CreateOKButton(); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs old mode 100644 new mode 100755 index 34e4e76..df9e60e --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/custom-control.cs @@ -221,7 +221,7 @@ namespace CustomControlTest // Add the image view to the row ImageView image = new ImageView(resources+"/images/gallery-" + i + ".jpg"); - image.Size = new Vector3(120.0f, 120.0f, 0.0f); + image.Size2D = new Size2D(120, 120); image.WidthResizePolicy = ResizePolicyType.Fixed; image.HeightResizePolicy = ResizePolicyType.Fixed; image.AlignSelf = (int)FlexContainer.Alignment.AlignCenter; @@ -235,7 +235,7 @@ namespace CustomControlTest // Add the rating control to the row view.ParentOrigin = ParentOrigin.Center; view.PivotPoint = PivotPoint.Center; - view.Size = new Vector3(200.0f, 40.0f, 0.0f); + view.Size2D = new Size2D(200, 40); view.Flex = 0.7f; view.AlignSelf = (int)FlexContainer.Alignment.AlignCenter; view.FlexMargin = new Vector4(30.0f, 0.0f, 0.0f, 0.0f); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs index be7571d..b25aa6e 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs @@ -95,7 +95,8 @@ namespace DaliTest class Example : NUIApplication { - private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + private const string _resPath = "./res"; //for ubuntu [UnmanagedFunctionPointer(CallingConvention.StdCall)] delegate void CallbackDelegate(IntPtr appPtr); // void, void delgate @@ -143,15 +144,15 @@ namespace DaliTest Tizen.Log.Debug("NUI", "myProperty value: " + myProperty ); int myPropertyIndex2 = handle.RegisterProperty("myProperty2", new PropertyValue(new Size(5.0f, 5.0f, 0.0f)), PropertyAccessMode.ReadWrite); - Size myProperty2 = new Size(0.0f, 0.0f, 0.0f); + Size2D myProperty2 = new Size2D(0, 0); handle.GetProperty(myPropertyIndex2).Get(myProperty2); Tizen.Log.Debug("NUI", "myProperty2 value: " + myProperty2.Width + ", " + myProperty2.Height ); View view = new View(); - view.Size = new Size(200.0f, 200.0f, 0.0f); + view.Size2D = new Size2D(200, 200); view.Name = "MyView"; //view.MixColor = new Color(1.0f, 0.0f, 1.0f, 0.8f); - Tizen.Log.Debug("NUI", "View size: " + view.Size.Width + ", " + view.Size.Height); + Tizen.Log.Debug("NUI", "View size: " + view.Size2D.Width + ", " + view.Size2D.Height); Tizen.Log.Debug("NUI", "View name: " + view.Name); Window window = Window.Instance; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs old mode 100644 new mode 100755 index dd26180..a797434 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker-using-json/date-picker-using-json.cs @@ -31,6 +31,9 @@ namespace DatePickerUsingJson private Spin _spinDay; // spin control for day private Builder _builder; // DALi Builder + //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + private const string _resPath = "./res"; //for ubuntu + public Example() : base() { } @@ -58,7 +61,7 @@ namespace DatePickerUsingJson constants.Insert( "CONFIG_SCRIPT_LOG_LEVEL", new PropertyValue( "Verbose") ); _builder.AddConstants( constants ); - _builder.LoadFromFile("/home/owner/apps_rw/NUISamples.TizenTV/res/json/date-picker-template.json" ); + _builder.LoadFromFile(_resPath + "/json/date-picker-template.json" ); // create the date-picker from the template in the json file BaseHandle handle = _builder.Create( "date-picker"); @@ -88,7 +91,7 @@ namespace DatePickerUsingJson keyboardFocusManager.PreFocusChange += OnKeyboardPreFocusChange; keyboardFocusManager.FocusedViewActivated += OnFocusedViewActivated; - StyleManager.Get().ApplyTheme("/home/owner/apps_rw/NUISamples.TizenTV/res/json/date-picker-theme.json"); + StyleManager.Get().ApplyTheme(_resPath + "/json/date-picker-theme.json"); } private View OnKeyboardPreFocusChange(object source, FocusManager.PreFocusChangeEventArgs e) diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs old mode 100644 new mode 100755 index 17ebef7..1163ee4 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/date-picker.cs @@ -53,7 +53,7 @@ namespace DatePickerTest _container = new FlexContainer(); _container.FlexDirection = FlexContainer.FlexDirectionType.Row; - _container.Size = new Vector3(480.0f, 150.0f, 0.0f); + _container.Size2D = new Size2D(480, 150); window.Add(_container); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs old mode 100644 new mode 100755 index 1e11b77..2a6274b --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/flex-container.cs @@ -34,7 +34,7 @@ namespace FlexContainerTest Window.Instance.BackgroundColor = new Color(0.1f, 0.8f, 0.1f, 1.0f); container = new FlexContainer(); - container.Size = new Size(Window.Instance.Size.Width, Window.Instance.Size.Height, 0); + container.Size2D = new Size2D(Window.Instance.Size.Width, Window.Instance.Size.Height); container.PivotPoint = PivotPoint.TopLeft; container.Padding = new Vector4(100, 100, 100, 100); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs index 6248758..fb1f994 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/gc-test.cs @@ -1,4 +1,3 @@ -using Tizen.Applications; using System.Collections.Generic; using System; @@ -34,7 +33,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); myViewList.Add(v); @@ -70,7 +70,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); v.Text = "label " + i; myViewList.Add(v); @@ -85,7 +86,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); v.LabelText = "button " + i; myViewList.Add(v); @@ -100,7 +102,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); v.ResourceUrl = resources + "/images/gallery-3.jpg"; myViewList.Add(v); @@ -115,7 +118,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); v.Text = "editor" + i; myViewList.Add(v); @@ -130,7 +134,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); v.Text = "field " + i; myViewList.Add(v); @@ -145,7 +150,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); v.LabelText = "check " + i; myViewList.Add(v); @@ -160,7 +166,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); myViewList.Add(v); @@ -174,7 +181,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); myViewList.Add(v); @@ -188,7 +196,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); myViewList.Add(v); @@ -202,7 +211,8 @@ namespace TizenVDUIApplication19 float intensity = myRandom.Next(0, 255) / 255.0f; v.BackgroundColor = new Color(intensity, intensity, intensity, 1); v.Position = new Position(myRandom.Next(0, 1820), myRandom.Next(0, 980), 0); - v.Size = new Size(100, 100, 0); + v.PivotPoint = PivotPoint.TopLeft; + v.Size2D = new Size2D(100, 100); myViewList.Add(v); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs index ea3a59e..b4dd9e2 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs @@ -96,7 +96,7 @@ namespace HelloWorldTest window.Add(_text); _view = new View(); - _view.Size = new Size(100, 100, 100); + _view.Size2D = new Size2D(100, 100); _view.SizeWidth = 50; Tizen.Log.Debug("NUI", "[1]_view SizeWidth=" + _view.SizeWidth); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs index 900d415..e119d29 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/image-view.cs @@ -92,7 +92,7 @@ namespace ImageViewTest _imageView.PivotPoint = PivotPoint.TopLeft; _imageView.Position = new Position(5.0f, 5.0f, 0.0f); _imageView.PixelArea = new Vector4(0.0f, 0.0f, 0.5f, 0.5f); - _imageView.Size = new Size(200.0f, 80.0f, 0.0f); + _imageView.Size2D = new Size2D(200, 80); //_imageView.SetResizePolicy(ResizePolicyType.USE_NATURAL_SIZE, DimensionType.ALL_DIMENSIONS); layer.Add(_imageView); @@ -129,7 +129,7 @@ namespace ImageViewTest nPatchImage.ParentOrigin = ParentOrigin.BottomLeft; nPatchImage.PivotPoint = PivotPoint.BottomLeft; nPatchImage.PositionUsesPivotPoint = true; - nPatchImage.Size = new Size(300.0f, 100.0f, 0.0f); + nPatchImage.Size2D = new Size2D(300, 100); nPatchImage.ImageMap = _map; layer.Add(nPatchImage); @@ -138,7 +138,7 @@ namespace ImageViewTest syncNineImage.PivotPoint = PivotPoint.CenterLeft; syncNineImage.Position2D = new Position2D(0, 200); syncNineImage.PositionUsesPivotPoint = true; - syncNineImage.Size = new Size(150.0f, 150.0f, 0.0f); + syncNineImage.Size2D = new Size2D(150, 150); syncNineImage.ResourceUrl = resources+"/images/00_popup_bg.9.png"; syncNineImage.SynchronosLoading = true; syncNineImage.Border = new Rectangle(0, 0, 0, 0); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs old mode 100644 new mode 100755 index 7a3dadf..4f4c45d --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs @@ -70,7 +70,7 @@ namespace ScrollViewTest // Create a scroll view _scrollView = new ScrollView(); Size windowSize = new Size(window.Size.Width, window.Size.Height, 0.0f); - _scrollView.Size = new Size(windowSize.Width, windowSize.Height, 0.0f); + _scrollView.Size2D = new Size2D((int)windowSize.Width, (int)windowSize.Height); _scrollView.ParentOrigin = ParentOrigin.Center; _scrollView.PivotPoint = PivotPoint.Center; window.Add(_scrollView); @@ -103,7 +103,7 @@ namespace ScrollViewTest ImageView imageView = new ImageView(resources+"/images/image-" + imageId + ".jpg"); imageView.ParentOrigin = ParentOrigin.Center; imageView.PivotPoint = PivotPoint.Center; - imageView.Size = new Size(imageSize.X, imageSize.Y, imageSize.Z); + imageView.Size2D = new Size2D((int)imageSize.X, (int)imageSize.Y); imageView.Position = new Position( margin * 0.5f + (imageSize.X + margin) * column - windowSize.Width * 0.5f + imageSize.X * 0.5f, margin * 0.5f + (imageSize.Y + margin) * row - windowSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f ); pageActor.Add(imageView); @@ -197,7 +197,7 @@ namespace ScrollViewTest Tizen.Log.Debug("NUI", "View OnRelayoutEventArgs EVENT callback...."); // Set the correct scroll bar size after size negotiation of scroll view is done - _scrollBar.Size = new Size(0.0f, _scrollView.GetRelayoutSize(DimensionType.Width), 0.0f); + _scrollBar.Size2D = new Size2D(0, (int)_scrollView.GetRelayoutSize(DimensionType.Width)); } /// diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs old mode 100644 new mode 100755 index dca7e30..54f6891 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs @@ -78,7 +78,7 @@ namespace UserAlphaFunctionTest window.Add(_text); _view1 = new View(); - _view1.Size = new Vector3(200.0f, 200.0f, 0.0f); + _view1.Size2D = new Size2D(200, 200); _view1.BackgroundColor = Color.Green; _view1.ParentOrigin = ParentOrigin.Center; _view1.PivotPoint = PivotPoint.Center; @@ -89,7 +89,7 @@ namespace UserAlphaFunctionTest _view2 = new View(); _view2.BackgroundColor = Color.Red; - _view2.Size = new Vector3(50.0f, 50.0f, 0.0f); + _view2.Size2D = new Size2D(50, 50); _view2.ParentOrigin = ParentOrigin.TopLeft; _view2.PivotPoint = PivotPoint.TopLeft; _view2.WidthResizePolicy = ResizePolicyType.Fixed; @@ -98,7 +98,7 @@ namespace UserAlphaFunctionTest _view3 = new View(); _view3.BackgroundColor = Color.Blue; - _view3.Size = new Vector3(50.0f, 50.0f, 0.0f); + _view3.Size2D = new Size2D(50, 50); _view3.ParentOrigin = ParentOrigin.TopLeft; _view3.PivotPoint = PivotPoint.TopLeft; _view3.WidthResizePolicy = ResizePolicyType.Fixed; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs old mode 100644 new mode 100755 index ca45028..71f324d --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/view-navi-property.cs @@ -41,7 +41,7 @@ namespace MyCSharpExample for (int i = 0; i < num; i++) { view[i] = new View(); - view[i].Size = new Size(200, 200, 0); + view[i].Size2D = new Size2D(200, 200); view[i].BackgroundColor = Color.Blue; view[i].Position = new Position(300 + i * 300, 300, 0); view[i].Name = "MyView" + i; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs index d6ac8d8..d175a11 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs @@ -30,7 +30,8 @@ namespace VisaulAnimationExample private TextLabel _title; private PushButton _shadowButton; private bool _active = false; - private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + private const string _resPath = "./res"; //for ubuntu private Animation _animation1; private bool _transitionInProgress = false; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test3.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test3.cs index ebe3cc3..f356c54 100755 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test3.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test3.cs @@ -36,7 +36,8 @@ namespace VisaulAnimationExample private bool _active1 = false; private bool _active2 = false; private bool _active3 = false; - private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + //private const string _resPath = "/home/owner/apps_rw/NUISamples.TizenTV/res"; + private const string _resPath = "./res"; //for ubuntu private Animation _animation; private ImageVisual _icon; diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs old mode 100644 new mode 100755 index 876a899..6c199d3 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test.cs @@ -62,7 +62,7 @@ namespace VisualViewTest _visualView = new VisualView(); _visualView.ParentOrigin = ParentOrigin.TopLeft; _visualView.PivotPoint = PivotPoint.TopLeft; - _visualView.Size = new Size(window.Size.Width, window.Size.Height, 0.0f); + _visualView.Size2D = new Size2D((int)window.Size.Width, (int)window.Size.Height); /* color visual */ ColorVisual colorVisualMap1 = new ColorVisual(); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs old mode 100644 new mode 100755 index 4bca14e..cad1003 --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test2.cs @@ -35,7 +35,7 @@ namespace VisualViewTest2 for (int i = 0; i < num; i++) { view[i] = new VisualView(); - view[i].Size = new Size(600, 600, 0); + view[i].Size2D = new Size2D(600, 600); view[i].BackgroundColor = Color.Blue; view[i].Position = new Position(400 + i * 800, 600, 0); view[i].Focusable = true; @@ -55,7 +55,7 @@ namespace VisualViewTest2 imageMap.Origin = Visual.AlignType.TopBegin; imageMap.Position = new Vector2(0, 0); imageMap.PositionPolicy = VisualTransformPolicyType.Absolute; - imageMap.Size = new Vector2(500, 500); + imageMap.Size = new Size2D(500, 500); imageMap.SizePolicy = VisualTransformPolicyType.Absolute; imageMap.DepthIndex = 0; view[0].AddVisual("bgVisual", imageMap); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs old mode 100644 new mode 100755 index eda52c5..ea9205a --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-view-test3.cs @@ -60,7 +60,7 @@ namespace VisualViewTest3 _visualView = new VisualView(); _visualView.ParentOrigin = ParentOrigin.TopLeft; _visualView.PivotPoint = PivotPoint.TopLeft; - _visualView.Size = new Size(window.Size.Width, window.Size.Height, 0.0f); + _visualView.Size2D = new Size2D(window.Size.Width, window.Size.Height); /* color visual */ ColorVisual colorVisualMap1 = new ColorVisual(); diff --git a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs old mode 100644 new mode 100755 index b20ffc5..559971d --- a/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs +++ b/NUISamples/NUISamples/NUISamples.TizenTV/examples/visuals-example.cs @@ -78,7 +78,7 @@ namespace VisualsExampleTest // colorVisual.Add( Visual.Property.Type, new PropertyValue( (int)Visual.Type.Color )) // .Add( ColorVisualProperty.MixColor, new PropertyValue( Color.Green )); //colorView.Background = colorVisual; - colorView.Size = new Size(500.0f, 200.0f, 0.0f); + colorView.Size2D = new Size2D(500, 200); colorView.ResourceUrl = resources+"/images/00_popup_bg.9.png"; colorView.Border = new Rectangle(100, 100, 100, 100); // colorView. diff --git a/src/Tizen.NUI/src/public/Property.cs b/src/Tizen.NUI/src/public/Property.cs index a1b30a0..7c87c3c 100755 --- a/src/Tizen.NUI/src/public/Property.cs +++ b/src/Tizen.NUI/src/public/Property.cs @@ -1171,6 +1171,15 @@ namespace Tizen.NUI } /// + /// Creates a Size property value. + /// + /// A Size values + internal PropertyValue(Size vectorValue) : this(NDalicPINVOKE.new_Property_Value__SWIG_5(Size.getCPtr(vectorValue)), true) + { + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + } + + /// /// Creates a Position property value. /// /// A Position values @@ -1212,6 +1221,17 @@ namespace Tizen.NUI } /// + /// Retrieves a Size value. + /// + /// On return, a Size value + internal bool Get(Size vectorValue) + { + bool ret = NDalicPINVOKE.Property_Value_Get__SWIG_6(swigCPtr, Size.getCPtr(vectorValue)); + if (NDalicPINVOKE.SWIGPendingException.Pending) throw NDalicPINVOKE.SWIGPendingException.Retrieve(); + return ret; + } + + /// /// Retrieves a Position value. /// /// On return, a Position value -- 2.7.4