Peter M. Groen / dali-demo

Commit 661f4fc896b5c000e6da355212a5dcd065021513

Authored by Adeel Kazmi
1 parent 3da4353a

Fixed build breaks after updating other dali repositories 

Change-Id: I25737c42c39ca4b24d9f0fc09098e66f920c9093
Signed-off-by: Adeel Kazmi <adeel.kazmi@samsung.com>
Inline Side-by-side
Showing 3 changed files with 8 additions and 6 deletions
demo/dali-table-view.cpp
  View file @661f4fc
@@ -194,7 +194,7 @@ public: @@ -194,7 +194,7 @@ public:
194 194
195 Vector3 operator()( const Vector3& current, const PropertyInput& scrollProperty ) 195 Vector3 operator()( const Vector3& current, const PropertyInput& scrollProperty )
196 { 196 {
197 - float scrollPos = scrollProperty.GetFloat(); 197 + float scrollPos = scrollProperty.GetVector3().x;
198 198
199 return mInitialPos + Vector3( -scrollPos * mScale, 0.0f, 0.0f ); 199 return mInitialPos + Vector3( -scrollPos * mScale, 0.0f, 0.0f );
200 } 200 }
@@ -829,17 +829,17 @@ void DaliTableView::SetupBackground( Actor addToLayer, const Vector2&amp; size ) @@ -829,17 +829,17 @@ void DaliTableView::SetupBackground( Actor addToLayer, const Vector2&amp; size )
829 829
830 // Add constraints 830 // Add constraints
831 Constraint animConstraint0 = Constraint::New < Vector3 > ( Actor::POSITION, 831 Constraint animConstraint0 = Constraint::New < Vector3 > ( Actor::POSITION,
832 - Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_X_PROPERTY_NAME ) ), 832 + Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
833 AnimScrollConstraint( backgroundAnimLayer0.GetCurrentPosition(), 0.75f ) ); 833 AnimScrollConstraint( backgroundAnimLayer0.GetCurrentPosition(), 0.75f ) );
834 backgroundAnimLayer0.ApplyConstraint( animConstraint0 ); 834 backgroundAnimLayer0.ApplyConstraint( animConstraint0 );
835 835
836 Constraint animConstraint1 = Constraint::New < Vector3 > ( Actor::POSITION, 836 Constraint animConstraint1 = Constraint::New < Vector3 > ( Actor::POSITION,
837 - Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_X_PROPERTY_NAME ) ), 837 + Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
838 AnimScrollConstraint( backgroundAnimLayer1.GetCurrentPosition(), 0.5f ) ); 838 AnimScrollConstraint( backgroundAnimLayer1.GetCurrentPosition(), 0.5f ) );
839 backgroundAnimLayer1.ApplyConstraint( animConstraint1 ); 839 backgroundAnimLayer1.ApplyConstraint( animConstraint1 );
840 840
841 Constraint animConstraint2 = Constraint::New < Vector3 > ( Actor::POSITION, 841 Constraint animConstraint2 = Constraint::New < Vector3 > ( Actor::POSITION,
842 - Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_X_PROPERTY_NAME ) ), 842 + Source( mScrollView, mScrollView.GetPropertyIndex( ScrollView::SCROLL_POSITION_PROPERTY_NAME ) ),
843 AnimScrollConstraint( backgroundAnimLayer2.GetCurrentPosition(), 0.25f ) ); 843 AnimScrollConstraint( backgroundAnimLayer2.GetCurrentPosition(), 0.25f ) );
844 backgroundAnimLayer2.ApplyConstraint( animConstraint2 ); 844 backgroundAnimLayer2.ApplyConstraint( animConstraint2 );
845 845
examples/page-turn-view/page-turn-view-example.cpp
  View file @661f4fc
@@ -229,7 +229,8 @@ void PageTurnController::OnInit( Application&amp; app ) @@ -229,7 +229,8 @@ void PageTurnController::OnInit( Application&amp; app )
229 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE ); 229 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE );
230 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE ); 230 winHandle.AddAvailableOrientation( Dali::Window::PORTRAIT_INVERSE );
231 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE ); 231 winHandle.AddAvailableOrientation( Dali::Window::LANDSCAPE_INVERSE );
232 - app.GetOrientation().ChangedSignal().Connect( &mView, &View::OrientationChanged ); 232 + // FIXME
  233 + //app.GetOrientation().ChangedSignal().Connect( &mView, &View::OrientationChanged );
233 // view will response to orientation change to display portrait or landscape views 234 // view will response to orientation change to display portrait or landscape views
234 mView.OrientationAnimationStartedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted ); 235 mView.OrientationAnimationStartedSignal().Connect( this, &PageTurnController::OnOrientationAnimationStarted );
235 236
examples/shared/view.h
  View file @661f4fc
@@ -97,8 +97,9 @@ Dali::Layer CreateView( Dali::Application&amp; application, @@ -97,8 +97,9 @@ Dali::Layer CreateView( Dali::Application&amp; application,
97 view.SetBackground( backgroundImageActor ); 97 view.SetBackground( backgroundImageActor );
98 } 98 }
99 99
  100 + // FIXME
100 // Connects the orientation signal with the View::OrientationChanged method. 101 // Connects the orientation signal with the View::OrientationChanged method.
101 - application.GetOrientation().ChangedSignal().Connect( &view, &Dali::Toolkit::View::OrientationChanged ); 102 + //application.GetOrientation().ChangedSignal().Connect( &view, &Dali::Toolkit::View::OrientationChanged );
102 103
103 // Create default ToolBar 104 // Create default ToolBar
104 105