X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fpage-turn-view%2Fpage-turn-view-impl.cpp;h=d70065fd9d79e1b55279b0b0ec8c871ec1f29604;hb=6275c8953b7908321d408a470b78c07383614b45;hp=6ede563072e9baa9d89f0b68561d1643176cf5fa;hpb=df92f45e89c92ca9b2286d51116ff7b69e75c569;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp index 6ede563..d70065f 100644 --- a/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp +++ b/dali-toolkit/internal/controls/page-turn-view/page-turn-view-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -21,9 +21,9 @@ // EXTERNAL INCLUDES #include #include -#include +#include #include -#include +#include #include // INTERNAL INCLUDES @@ -423,13 +423,13 @@ void PageTurnView::SetupShadowView() mShadowView.Activate(); } -void PageTurnView::OnControlStageConnection() +void PageTurnView::OnStageConnection() { SetupShadowView(); mTurningPageLayer.RaiseToTop(); } -void PageTurnView::OnControlStageDisconnection() +void PageTurnView::OnStageDisconnection() { if(mShadowView) { @@ -453,12 +453,6 @@ void PageTurnView::OnControlStageDisconnection() } } -void PageTurnView::OnControlSizeSet( const Vector3& size ) -{ - // disable the SetSize of the control from the application - Self().SetSize( mControlSize ); -} - void PageTurnView::SetSpineShadowParameter( const Vector2& spineShadowParameter ) { mSpineShadowParameter = spineShadowParameter;