Merge "[NUI-252] change string type of property to enum type of property" into tizen
authordongsug song <dongsug.song@samsung.com>
Fri, 14 Apr 2017 03:22:28 +0000 (20:22 -0700)
committerGerrit Code Review <gerrit@review.vlan103.tizen.org>
Fri, 14 Apr 2017 03:22:29 +0000 (20:22 -0700)
12 files changed:
1  2 
NUISamples/NUISamples/NUISamples.TizenTV/examples/control-dashboard.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/dali-test.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-test.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/hello-world.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/scroll-view.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/user-alphafunction.cs
NUISamples/NUISamples/NUISamples.TizenTV/examples/visual-animation-test.cs
src/Tizen.NUI/src/public/CameraActor.cs
src/Tizen.NUI/src/public/CustomView/Spin.cs
src/Tizen.NUI/src/public/CustomView/VisualView.cs
src/Tizen.NUI/src/public/View.cs
src/Tizen.NUI/src/public/VisualMaps.cs

@@@ -151,14 -151,14 +151,14 @@@ namespace DaliTes
              TextLabel text = new TextLabel("Hello Mono World");
              text.ParentOrigin = ParentOrigin.Center;
              text.AnchorPoint = AnchorPoint.Center;
-             text.HorizontalAlignment = "CENTER";
+             text.HorizontalAlignment = HorizontalAlignment.HorizontalAlignCenter;
              stage.GetDefaultLayer().Add(text);
  
 -            Console.WriteLine( "Text label text:  " + text.Text );
 +            Tizen.Log.Debug("NUI",  "Text label text:  " + text.Text );
  
 -            Console.WriteLine( "Text label point size:  " + text.PointSize );
 +            Tizen.Log.Debug("NUI",  "Text label point size:  " + text.PointSize );
              text.PointSize = 32.0f;
 -            Console.WriteLine( "Text label new point size:  " + text.PointSize );
 +            Tizen.Log.Debug("NUI",  "Text label new point size:  " + text.PointSize );
  
              RectanglePaddingClassTest();
  
@@@ -378,4 -378,4 +378,4 @@@ namespace Tizen.NU
              }
          }
      }
--}
++}
Simple merge