Property refactor in dali-toolkit: Demo changes for compiling 40/36140/6 accepted/tizen/common/20150309.092034 accepted/tizen/common/20150310.094803 accepted/tizen/mobile/20150309.081759 accepted/tizen/mobile/20150310.122237 accepted/tizen/tv/20150309.081816 accepted/tizen/tv/20150310.092420 accepted/tizen/wearable/20150309.110934 accepted/tizen/wearable/20150310.114555 submit/tizen/20150309.074330 submit/tizen/20150310.084835
authorTom Robinson <tom.robinson@samsung.com>
Mon, 2 Mar 2015 17:11:59 +0000 (17:11 +0000)
committerTom Robinson <tom.robinson@samsung.com>
Fri, 6 Mar 2015 11:20:14 +0000 (11:20 +0000)
Change-Id: I18d69dba01824ffaa1cd3a4c6b9ead3a38981bc7

examples/item-view/item-view-example.cpp
examples/path-animation/path-animation.cpp

index 651c771..a3cd43a 100644 (file)
@@ -971,11 +971,11 @@ private:
     mMenu.Add( tableView );
 
     Slider slider = Slider::New();
-    slider.SetProperty( Slider::LOWER_BOUND_PROPERTY, 0.0f );
-    slider.SetProperty( Slider::UPPER_BOUND_PROPERTY, 3.0f );
-    slider.SetProperty( Slider::VALUE_PROPERTY, mDurationSeconds );
-    slider.SetProperty( Slider::VALUE_PRECISION_PROPERTY, 2 );
-    slider.SetProperty( Slider::SHOW_POPUP_PROPERTY, true );
+    slider.SetProperty( Slider::Property::LOWER_BOUND, 0.0f );
+    slider.SetProperty( Slider::Property::UPPER_BOUND, 3.0f );
+    slider.SetProperty( Slider::Property::VALUE, mDurationSeconds );
+    slider.SetProperty( Slider::Property::VALUE_PRECISION, 2 );
+    slider.SetProperty( Slider::Property::SHOW_POPUP, true );
     slider.ValueChangedSignal().Connect( this, &ItemViewExample::SliderValueChange );
     tableView.AddChild( slider, TableView::CellPosition( 0, 0 ) );
     tableView.SetRelativeHeight( 0, 0.5f );
index 3b62bda..5dea82a 100644 (file)
@@ -71,8 +71,8 @@ public:
     Slider slider = Slider::New();
     slider.SetAnchorPoint( AnchorPoint::CENTER_LEFT);
     slider.SetParentOrigin( ParentOrigin::CENTER_RIGHT);
-    slider.SetProperty(Slider::LOWER_BOUND_PROPERTY, -1.0f );
-    slider.SetProperty(Slider::UPPER_BOUND_PROPERTY, 1.0f );
+    slider.SetProperty(Slider::Property::LOWER_BOUND, -1.0f );
+    slider.SetProperty(Slider::Property::UPPER_BOUND, 1.0f );
 
     Property::Array marks;
     float mark = -1.0f;
@@ -82,8 +82,8 @@ public:
       mark += 0.1f;
     }
 
-    slider.SetProperty(Slider::MARKS_PROPERTY, marks);
-    slider.SetProperty(Slider::SNAP_TO_MARKS_PROPERTY, true );
+    slider.SetProperty(Slider::Property::MARKS, marks);
+    slider.SetProperty(Slider::Property::SNAP_TO_MARKS, true );
     slider.SetSize(size);
     slider.SetScale( 0.5f );
     slider.ValueChangedSignal().Connect(this,callback);