projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Added test cases and removed dead code
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
page-turn-view
/
page-turn-view-impl.cpp
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
9e2e7bb
..
20c57c0
100644
(file)
--- 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
@@
-32,9
+32,6
@@
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
#include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
#include <dali-toolkit/internal/controls/page-turn-view/page-turn-book-spine-effect.h>
#include <dali-toolkit/internal/controls/renderers/renderer-factory-cache.h>
-// headers needed for backward compatibility of PageFactory::NewPage(pageId) API
-#include <dali/public-api/actors/image-actor.h>
-
using namespace Dali;
namespace //Unnamed namespace
using namespace Dali;
namespace //Unnamed namespace
@@
-352,7
+349,7
@@
void PageTurnView::Page::SetCurrentCenter( const Vector2& value )
}
PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )
}
PageTurnView::PageTurnView( PageFactory& pageFactory, const Vector2& pageSize )
-: Control( ControlBehaviour(
REQUIRES_TOUCH_EVENTS
) ),
+: Control( ControlBehaviour(
ACTOR_BEHAVIOUR_NONE
) ),
mPageFactory( &pageFactory ),
mPageSize( pageSize ),
mSpineShadowParameter( DEFAULT_SPINE_SHADOW_PARAMETER ),
mPageFactory( &pageFactory ),
mPageSize( pageSize ),
mSpineShadowParameter( DEFAULT_SPINE_SHADOW_PARAMETER ),