Fixed build breaks after updating other dali repositories

Change-Id: I25737c42c39ca4b24d9f0fc09098e66f920c9093
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>

diff --git a/demo/dali-table-view.cpp b/demo/dali-table-view.cpp
index 56424c5..33d1ba8 100644 (file)
--- a/demo/dali-table-view.cpp
+++ b/demo/dali-table-view.cpp
@@ -194,7 +194,7 @@ public:
 
   Vector3 operator()( const Vector3& current, const PropertyInput& scrollProperty )
   {
-    float scrollPos = scrollProperty.GetFloat();
+    float scrollPos = scrollProperty.GetVector3().x;
 
     return mInitialPos + Vector3( -scrollPos * mScale, 0.0f, 0.0f );
   }
@@ -829,17 +829,17 @@ void DaliTableView::SetupBackground( Actor addToLayer, const Vector2& size )
 
   // Add constraints
   Constraint animConstraint0 = Constraint::New < Vector3 > ( Actor::POSITION,
-      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_X_PROPERTY_NAME ) ),
+      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
       AnimScrollConstraint( backgroundAnimLayer0.GetCurrentPosition(), 0.75f ) );
   backgroundAnimLayer0.ApplyConstraint( animConstraint0 );
 
   Constraint animConstraint1 = Constraint::New < Vector3 > ( Actor::POSITION,
-      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_X_PROPERTY_NAME ) ),
+      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
       AnimScrollConstraint( backgroundAnimLayer1.GetCurrentPosition(), 0.5f ) );
   backgroundAnimLayer1.ApplyConstraint( animConstraint1 );
 
   Constraint animConstraint2 = Constraint::New < Vector3 > ( Actor::POSITION,
-      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_X_PROPERTY_NAME ) ),
+      Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
       AnimScrollConstraint( backgroundAnimLayer2.GetCurrentPosition(), 0.25f ) );
   backgroundAnimLayer2.ApplyConstraint( animConstraint2 );
 

diff --git a/examples/page-turn-view/page-turn-view-example.cpp b/examples/page-turn-view/page-turn-view-example.cpp
index 5ebdf8d..e08bf34 100644 (file)
--- a/examples/page-turn-view/page-turn-view-example.cpp
+++ b/examples/page-turn-view/page-turn-view-example.cpp
@@ -229,7 +229,8 @@ void PageTurnController::OnInit( Application& app )
   winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
   winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE  );
   winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
-  app.GetOrientation().ChangedSignal().Connect( &mView, &View::OrientationChanged );
+  // FIXME
+  //app.GetOrientation().ChangedSignal().Connect( &mView, &View::OrientationChanged );
   // view will response to orientation change to display portrait or landscape views
   mView.OrientationAnimationStartedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted );
 

diff --git a/examples/shared/view.h b/examples/shared/view.h
index 41a8f38..b961b78 100644 (file)
--- a/examples/shared/view.h
+++ b/examples/shared/view.h
@@ -97,8 +97,9 @@ Dali::Layer CreateView( Dali::Application& application,
     view.SetBackground( backgroundImageActor );
   }
 
+  // FIXME
   // Connects the orientation signal with the View::OrientationChanged method.
-  application.GetOrientation().ChangedSignal().Connect( &view, &Dali::Toolkit::View::OrientationChanged );
+  //application.GetOrientation().ChangedSignal().Connect( &view, &Dali::Toolkit::View::OrientationChanged );
 
   // Create default ToolBar