X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali%2Finternal%2Fevent%2Fcommon%2Fscene-impl.cpp;h=208c1f7805e6e7a59d436a50be4840a11fc5ab78;hb=8f612650d20752ab6aba022a9dbefdb883968e8f;hp=af08928c76d9ab46c2a83c4da69a6839dab28103;hpb=88ae3723ccc6986111eb84b77e6fea69034c9cae;p=platform%2Fcore%2Fuifw%2Fdali-core.git diff --git a/dali/internal/event/common/scene-impl.cpp b/dali/internal/event/common/scene-impl.cpp index af08928..208c1f7 100755 --- a/dali/internal/event/common/scene-impl.cpp +++ b/dali/internal/event/common/scene-impl.cpp @@ -29,6 +29,7 @@ #include #include #include +#include #include #include #include @@ -42,19 +43,22 @@ namespace Dali namespace Internal { -namespace +ScenePtr Scene::New( Size size ) { + ScenePtr scene = new Scene; -const Vector4 DEFAULT_BACKGROUND_COLOR(0.0f, 0.0f, 0.0f, 1.0f); // Default background color + // Second-phase construction + scene->Initialize( size, 0 ); -} //Unnamed namespace + return scene; +} -ScenePtr Scene::New( Size size ) +ScenePtr Scene::New( Size size, int orientation ) { ScenePtr scene = new Scene; // Second-phase construction - scene->Initialize( size ); + scene->Initialize( size, orientation ); return scene; } @@ -101,7 +105,7 @@ Scene::~Scene() // When this destructor is called, the scene has either already been removed from Core or Core has already been destroyed } -void Scene::Initialize( Size size ) +void Scene::Initialize( Size size, int orientation ) { ThreadLocalStorage* tls = ThreadLocalStorage::GetInternal(); @@ -137,6 +141,7 @@ void Scene::Initialize( Size size ) // Create the default render-task and ensure clear is enabled on it to show the background color RenderTaskPtr renderTask = mRenderTaskList->CreateTask( mRootLayer.Get(), mDefaultCamera.Get() ); renderTask->SetClearEnabled(true); + mSurfaceOrientation = orientation; SurfaceResized( size.width, size.height, mSurfaceOrientation, false ); @@ -324,9 +329,9 @@ void Scene::EmitEventProcessingFinishedSignal() void Scene::EmitTouchedSignal( const Dali::TouchEvent& touch ) { Dali::Integration::Scene handle( this ); - if ( !mTouchSignal.Empty() ) + if ( !mTouchedSignal.Empty() ) { - mTouchSignal.Emit( touch ); + mTouchedSignal.Emit( touch ); } } @@ -376,9 +381,9 @@ Integration::Scene::EventProcessingFinishedSignalType& Scene::EventProcessingFin return mEventProcessingFinishedSignal; } -Integration::Scene::TouchSignalType& Scene::TouchSignal() +Integration::Scene::TouchEventSignalType& Scene::TouchedSignal() { - return mTouchSignal; + return mTouchedSignal; } Integration::Scene::WheelEventSignalType& Scene::WheelEventSignal()