Revert "[Tizen] Support Ecore-Wayland2"

[platform/core/uifw/dali-adaptor.git] / dali / internal / window-system / common / window-impl.cpp

diff --git a/dali/internal/window-system/common/window-impl.cpp b/dali/internal/window-system/common/window-impl.cpp
index 0d84262..715861e 100644 (file)
--- a/dali/internal/window-system/common/window-impl.cpp
+++ b/dali/internal/window-system/common/window-impl.cpp
@@ -27,10 +27,11 @@
 
 // INTERNAL HEADERS
 #include <dali/internal/input/common/drag-and-drop-detector-impl.h>
+#include <dali/internal/window-system/common/ecore-indicator-impl.h>
 #include <dali/internal/window-system/common/window-visibility-observer.h>
 #include <dali/internal/window-system/common/orientation-impl.h>
 #include <dali/internal/window-system/common/render-surface-factory.h>
-#include <dali/internal/window-system/common/window-factory.h>
+#include <dali/internal/window-system/common/window-base-factory.h>
 #include <dali/internal/window-system/common/window-base.h>
 #include <dali/internal/window-system/common/window-render-surface.h>
 
@@ -71,7 +72,7 @@ Window::Window()
   mIconified( false ),
   mOpaqueState( false ),
   mResizeEnabled( false ),
-  mIndicator(),
+  mIndicator( NULL ),
   mIndicatorOrientation( Dali::Window::PORTRAIT ),
   mNextIndicatorOrientation( Dali::Window::PORTRAIT ),
   mIndicatorOpacityMode( Dali::Window::OPAQUE ),
@@ -95,6 +96,7 @@ Window::~Window()
     Dali::RenderTask indicatorTask = taskList.GetTask(0);
     mOverlay->GetOverlayRenderTasks().RemoveTask(indicatorTask);
     mIndicator->Close();
+    delete mIndicator;
   }
 
   if ( mAdaptor )
@@ -116,8 +118,8 @@ void Window::Initialize(const PositionSize& positionSize, const std::string& nam
   mSurface = windowRenderSurface.release();
 
   // create a window base
-  auto windowFactory = Dali::Internal::Adaptor::GetWindowFactory();
-  mWindowBase = windowFactory->CreateWindowBase( this, mSurface );
+  auto windowBaseFactory = Dali::Internal::Adaptor::GetWindowBaseFactory();
+  mWindowBase = windowBaseFactory->CreateWindowBase( this, mSurface );
 
   mWindowBase->Initialize();
 
@@ -607,15 +609,11 @@ void Window::DoShowIndicator( Dali::Window::WindowOrientation lastOrientation )
   {
     if( mIndicatorVisible != Dali::Window::INVISIBLE )
     {
-      auto windowFactory = Dali::Internal::Adaptor::GetWindowFactory();
-      mIndicator = windowFactory->CreateIndicator( mAdaptor, mIndicatorOrientation, this );
-      if( mIndicator )
-      {
-        mIndicator->SetOpacityMode( mIndicatorOpacityMode );
-        Dali::Actor actor = mIndicator->GetActor();
-        SetIndicatorActorRotation();
-        mOverlay->Add(actor);
-      }
+      mIndicator = new Indicator( mAdaptor, mIndicatorOrientation, this );
+      mIndicator->SetOpacityMode( mIndicatorOpacityMode );
+      Dali::Actor actor = mIndicator->GetActor();
+      SetIndicatorActorRotation();
+      mOverlay->Add(actor);
     }
     // else don't create a hidden indicator
   }
@@ -651,10 +649,7 @@ void Window::DoRotateIndicator( Dali::Window::WindowOrientation orientation )
   {
     mShowRotatedIndicatorOnClose = true;
     mNextIndicatorOrientation = orientation;
-    if( mIndicator )
-    {
-      mIndicator->Close(); // May synchronously call IndicatorClosed() callback
-    }
+    mIndicator->Close(); // May synchronously call IndicatorClosed() callback
   }
   else
   {
@@ -667,32 +662,31 @@ void Window::DoRotateIndicator( Dali::Window::WindowOrientation orientation )
 void Window::SetIndicatorActorRotation()
 {
   DALI_LOG_TRACE_METHOD( gWindowLogFilter );
-  if( mIndicator )
+  DALI_ASSERT_DEBUG( mIndicator != NULL );
+
+  Dali::Actor actor = mIndicator->GetActor();
+  switch( mIndicatorOrientation )
   {
-    Dali::Actor actor = mIndicator->GetActor();
-    switch( mIndicatorOrientation )
-    {
-      case Dali::Window::PORTRAIT:
-        actor.SetParentOrigin( ParentOrigin::TOP_CENTER );
-        actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-        actor.SetOrientation( Degree(0), Vector3::ZAXIS );
-        break;
-      case Dali::Window::PORTRAIT_INVERSE:
-        actor.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
-        actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-        actor.SetOrientation( Degree(180), Vector3::ZAXIS );
-        break;
-      case Dali::Window::LANDSCAPE:
-        actor.SetParentOrigin( ParentOrigin::CENTER_LEFT );
-        actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-        actor.SetOrientation( Degree(270), Vector3::ZAXIS );
-        break;
-      case Dali::Window::LANDSCAPE_INVERSE:
-        actor.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
-        actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
-        actor.SetOrientation( Degree(90), Vector3::ZAXIS );
-        break;
-    }
+    case Dali::Window::PORTRAIT:
+      actor.SetParentOrigin( ParentOrigin::TOP_CENTER );
+      actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
+      actor.SetOrientation( Degree(0), Vector3::ZAXIS );
+      break;
+    case Dali::Window::PORTRAIT_INVERSE:
+      actor.SetParentOrigin( ParentOrigin::BOTTOM_CENTER );
+      actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
+      actor.SetOrientation( Degree(180), Vector3::ZAXIS );
+      break;
+    case Dali::Window::LANDSCAPE:
+      actor.SetParentOrigin( ParentOrigin::CENTER_LEFT );
+      actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
+      actor.SetOrientation( Degree(270), Vector3::ZAXIS );
+      break;
+    case Dali::Window::LANDSCAPE_INVERSE:
+      actor.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
+      actor.SetAnchorPoint(  AnchorPoint::TOP_CENTER );
+      actor.SetOrientation( Degree(90), Vector3::ZAXIS );
+      break;
   }
 }
 
@@ -701,7 +695,7 @@ void Window::SetIndicatorProperties( bool isShow, Dali::Window::WindowOrientatio
   mWindowBase->SetIndicatorProperties( isShow, lastOrientation );
 }
 
-void Window::IndicatorTypeChanged( IndicatorInterface::Type type )
+void Window::IndicatorTypeChanged(Indicator::Type type)
 {
   mWindowBase->IndicatorTypeChanged( type );
 }
@@ -713,10 +707,7 @@ void Window::IndicatorClosed( IndicatorInterface* indicator )
   if( mShowRotatedIndicatorOnClose )
   {
     Dali::Window::WindowOrientation currentOrientation = mIndicatorOrientation;
-    if( mIndicator )
-    {
-      mIndicator->Open( mNextIndicatorOrientation );
-    }
+    mIndicator->Open( mNextIndicatorOrientation );
     mIndicatorOrientation = mNextIndicatorOrientation;
     SetIndicatorActorRotation();
     DoShowIndicator( currentOrientation );
@@ -755,7 +746,8 @@ void Window::OnStop()
     mIndicator->Close();
   }
 
-  mIndicator.release();
+  delete mIndicator;
+  mIndicator = NULL;
 }
 
 void Window::OnDestroy()