X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=plugins%2Fdali-sharp%2Fexamples%2Fscroll-view.cs;h=9c199d2e360e3949de737d03984af353690b6dff;hp=a1964c70eb27be0eb0b5415114749ee559679df2;hb=318378db7fbb0bcfb08c3c603f54857d6f5c9639;hpb=264dbea55c45e722c30a17782cdca6da07c59fca

diff --git a/plugins/dali-sharp/examples/scroll-view.cs b/plugins/dali-sharp/examples/scroll-view.cs
index a1964c7..9c199d2 100755
--- a/plugins/dali-sharp/examples/scroll-view.cs
+++ b/plugins/dali-sharp/examples/scroll-view.cs
@@ -42,16 +42,16 @@ namespace MyCSharpExample
 
         private void CreateScrollView()
         {
-            Stage stage = Stage.GetCurrent();
-            stage.BackgroundColor = Color.White;
+            Window window = Window.Instance;
+            window.BackgroundColor = Color.White;
 
             // Create a scroll view
             _scrollView = new ScrollView();
-            Size2D stageSize = stage.Size;
-            _scrollView.Size = new Position(stageSize.Width, stageSize.Height, 0.0f);
+            Size2D windowSize = window.Size;
+            _scrollView.Size = new Position(windowSize.Width, windowSize.Height, 0.0f);
             _scrollView.ParentOrigin = NDalic.ParentOriginCenter;
-            _scrollView.AnchorPoint = NDalic.AnchorPointCenter;
-            stage.Add(_scrollView);
+            _scrollView.PivotPoint = NDalic.AnchorPointCenter;
+            window.Add(_scrollView);
 
             // Add actors to a scroll view with 3 pages
             int pageRows = 1;
@@ -61,16 +61,16 @@ namespace MyCSharpExample
                 for (int pageColumn = 0; pageColumn < pageColumns; pageColumn++)
                 {
                     View pageActor = new View();
-                    pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.ALL_DIMENSIONS);
+                    pageActor.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.AllDimensions);
                     pageActor.ParentOrigin = NDalic.ParentOriginCenter;
-                    pageActor.AnchorPoint = NDalic.AnchorPointCenter;
-                    pageActor.Position = new Position(pageColumn * stageSize.Width, pageRow * stageSize.Height, 0.0f);
+                    pageActor.PivotPoint = NDalic.AnchorPointCenter;
+                    pageActor.Position = new Position(pageColumn * windowSize.Width, pageRow * windowSize.Height, 0.0f);
 
                     // Add images in a 3x4 grid layout for each page
                     int imageRows = 4;
                     int imageColumns = 3;
                     float margin = 10.0f;
-                    Position imageSize = new Position((stageSize.Width / imageColumns) - margin, (stageSize.Height / imageRows) - margin, 0.0f);
+                    Position imageSize = new Position((windowSize.Width / imageColumns) - margin, (windowSize.Height / imageRows) - margin, 0.0f);
 
                     for (int row = 0; row < imageRows; row++)
                     {
@@ -79,10 +79,10 @@ namespace MyCSharpExample
                             int imageId = (row * imageColumns + column) % 2 + 1;
                             ImageView imageView = new ImageView("images/image-" + imageId + ".jpg");
                             imageView.ParentOrigin = NDalic.ParentOriginCenter;
-                            imageView.AnchorPoint = NDalic.AnchorPointCenter;
+                            imageView.PivotPoint = NDalic.AnchorPointCenter;
                             imageView.Size = imageSize;
-                            imageView.Position = new Position(margin * 0.5f + (imageSize.X + margin) * column - stageSize.Width * 0.5f + imageSize.X * 0.5f,
-                                                 margin * 0.5f + (imageSize.Y + margin) * row - stageSize.Height * 0.5f + imageSize.Y * 0.5f, 0.0f);
+                            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);
                         }
                     }
@@ -95,30 +95,30 @@ namespace MyCSharpExample
 
             // Set scroll view to have 3 pages in X axis and allow page snapping,
             // and also disable scrolling in Y axis.
-            RulerPtr scrollRulerX = new RulerPtr(new FixedRuler(stageSize.Width));
-            RulerPtr scrollRulerY = new RulerPtr(new DefaultRuler());
-            scrollRulerX.SetDomain(new RulerDomain(0.0f, stageSize.Width * pageColumns, true));
-            scrollRulerY.Disable();
-            _scrollView.SetRulerX(scrollRulerX);
-            _scrollView.SetRulerY(scrollRulerY);
+            Property.Map rulerMap = new Property.Map();
+            rulerMap.Add((int)Dali.Constants.ScrollModeType.XAxisScrollEnabled, new Property.Value(true));
+            rulerMap.Add((int)Dali.Constants.ScrollModeType.XAxisSnapToInterval, new Property.Value(windowSize.Width));
+            rulerMap.Add((int)Dali.Constants.ScrollModeType.XAxisScrollBoundary, new Property.Value(windowSize.Width * pageColumns ) );
+            rulerMap.Add((int)Dali.Constants.ScrollModeType.YAxisScrollEnabled, new Property.Value( false ) );
+            _scrollView.ScrollMode = rulerMap;
 
             // Create a horizontal scroll bar in the bottom of scroll view (which is optional)
             _scrollBar = new ScrollBar();
             _scrollBar.ParentOrigin = NDalic.ParentOriginBottomLeft;
-            _scrollBar.AnchorPoint = NDalic.AnchorPointTopLeft;
-            _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.WIDTH);
-            _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.HEIGHT);
+            _scrollBar.PivotPoint = NDalic.AnchorPointTopLeft;
+            _scrollBar.SetResizePolicy(ResizePolicyType.FIT_TO_CHILDREN, DimensionType.Width);
+            _scrollBar.SetResizePolicy(ResizePolicyType.FILL_TO_PARENT, DimensionType.Height);
             _scrollBar.Orientation = new Rotation(new Radian(new Degree(270.0f)), Vector3.ZAXIS);
             _scrollBar.SetScrollDirection(ScrollBar.Direction.Horizontal);
             _scrollView.Add(_scrollBar);
 
             // Connect to the OnRelayout signal
-            _scrollView.OnRelayoutEvent += OnScrollViewRelayout;
+            _scrollView.Relayout += OnScrollViewRelayout;
             _scrollView.Touched += OnTouch;
-            _scrollView.WheelMoved += Onwheel;
-            _scrollView.KeyInputFocusGained += OnKey;
+            _scrollView.WheelRolled += Onwheel;
+            _scrollView.FocusGained += OnKey;
             _text = new TextLabel("View Touch Event Handler Test");
-            _text.AnchorPoint = NDalic.AnchorPointTopLeft;
+            _text.PivotPoint = NDalic.AnchorPointTopLeft;
             _text.HorizontalAlignment = "CENTER";
             _text.PointSize = 48.0f;
 
@@ -149,7 +149,7 @@ namespace MyCSharpExample
             // Only animate the _text label when touch down happens
             if (e.Touch.GetState(0) == PointStateType.DOWN)
             {
-                Console.WriteLine("Customized Stage Touch event handler");
+                Console.WriteLine("Customized Window Touch event handler");
                 // Create a new _animation
                 if (_animation)
                 {
@@ -175,7 +175,7 @@ namespace MyCSharpExample
             Console.WriteLine("View OnRelayoutEventArgs EVENT callback....");
 
             // Set the correct scroll bar size after size negotiation of scroll view is done
-            _scrollBar.Size = new Position(0.0f, _scrollView.GetRelayoutSize(DimensionType.WIDTH), 0.0f);
+            _scrollBar.Size = new Position(0.0f, _scrollView.GetRelayoutSize(DimensionType.Width), 0.0f);
         }
 
         public void MainLoop()