Revert "[Tizen] Add Effect Start/End signal"
authorHeeyong Song <heeyong.song@samsung.com>
Tue, 12 Nov 2019 06:15:42 +0000 (15:15 +0900)
committerHeeyong Song <heeyong.song@samsung.com>
Tue, 12 Nov 2019 06:15:45 +0000 (15:15 +0900)
This reverts commit 7f88db61bcdf7f900878752c47b7e8e0a5a31bd5.

Change-Id: I0382f4ecae5845df350fa5f072869643e77549a1

dali/devel-api/adaptor-framework/window-devel.cpp
dali/devel-api/adaptor-framework/window-devel.h
dali/internal/window-system/common/window-base.cpp
dali/internal/window-system/common/window-base.h
dali/internal/window-system/common/window-impl.cpp
dali/internal/window-system/common/window-impl.h
dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.cpp
dali/internal/window-system/tizen-wayland/ecore-wl2/window-base-ecore-wl2.h

index c16a520..9d93348 100644 (file)
@@ -65,11 +65,6 @@ WheelEventSignalType& WheelEventSignal( Window window )
   return GetImplementation( window ).WheelEventSignal();
 }
 
-TransitionEffectEventSignalType& TransitionEffectEventSignal( Window window )
-{
-  return GetImplementation( window ).TransitionEffectEventSignal();
-}
-
 void SetParent( Window window, Window parent )
 {
   GetImplementation( window ).SetParent( parent );
index da532d3..ca90c51 100644 (file)
@@ -30,25 +30,6 @@ class RenderTaskList;
 
 namespace DevelWindow
 {
-/**
- * @brief Enumeration for transition effect's state.
- */
-enum class EffectState
-{
-  NONE = 0,    ///< None state
-  START,       ///< Transition effect is started.
-  END          ///< Transition effect is ended.
-};
-
-/**
- * @brief Enumeration for transition effect's type.
- */
-enum class  EffectType
-{
-  NONE = 0,    ///< None type
-  SHOW,        ///< Window show effect.
-  HIDE,        ///< Window hide effect.
-};
 
 typedef Signal< void () > EventProcessingFinishedSignalType;       ///< Event Processing finished signal type
 
@@ -58,8 +39,6 @@ typedef Signal< void (const TouchData&) > TouchSignalType;         ///< Touch si
 
 typedef Signal< void (const WheelEvent&) > WheelEventSignalType;   ///< Touched signal type
 
-typedef Signal< void (Window, EffectState, EffectType) > TransitionEffectEventSignalType; ///< Effect signal type and state
-
 /**
  * @brief Sets position and size of the window. This API guarantees that both moving and resizing of window will appear on the screen at once.
  *
@@ -135,21 +114,6 @@ DALI_ADAPTOR_API TouchSignalType& TouchSignal( Window window );
 DALI_ADAPTOR_API WheelEventSignalType& WheelEventSignal( Window window );
 
 /**
- * @brief This signal is emitted for transition effect.
- *
- * The transition animation is appeared when the window is shown/hidden.
- * When the animation is started, START signal is emitted.
- * Then the animation is ended, END signal is emitted, too.
- * A callback of the following type may be connected:
- * @code
- *   void YourCallbackName( Window window, EffectState state, EffectType type );
- * @endcode
- * @param[in] window The window instance
- * @return The signal to connect to
- */
-DALI_ADAPTOR_API TransitionEffectEventSignalType& TransitionEffectEventSignal( Window window );
-
-/**
  * @brief Sets parent window of the window.
  *
  * After setting that, these windows do together when raise-up, lower and iconified/deiconified.
index f3101b6..8c63be3 100644 (file)
@@ -40,8 +40,7 @@ WindowBase::WindowBase()
   mSelectionDataSendSignal(),
   mSelectionDataReceivedSignal(),
   mStyleChangedSignal(),
-  mAccessibilitySignal(),
-  mTransitionEffectEventSignal()
+  mAccessibilitySignal()
 {
 }
 
@@ -114,11 +113,6 @@ WindowBase::AccessibilitySignalType& WindowBase::AccessibilitySignal()
   return mAccessibilitySignal;
 }
 
-WindowBase::TransitionEffectEventSignalType& WindowBase::TransitionEffectEventSignal()
-{
-  return mTransitionEffectEventSignal;
-}
-
 } // namespace Adaptor
 
 } // namespace Internal
index 86cb25b..2246d6c 100644 (file)
@@ -30,7 +30,6 @@
 #include <dali/public-api/adaptor-framework/window.h>
 #include <dali/public-api/adaptor-framework/key-grab.h>
 #include <dali/public-api/adaptor-framework/style-change.h>
-#include <dali/devel-api/adaptor-framework/window-devel.h>
 #include <dali/internal/window-system/common/damage-observer.h>
 #include <dali/internal/window-system/common/rotation-event.h>
 #include <dali/internal/graphics/gles/egl-implementation.h>
@@ -70,7 +69,6 @@ public:
   typedef Signal< void ( ) > DeleteSignalType;
   typedef Signal< void ( const DamageArea& ) > DamageSignalType;
   typedef Signal< void ( const RotationEvent& ) > RotationSignalType;
-  typedef Signal< void ( DevelWindow::EffectState, DevelWindow::EffectType ) > TransitionEffectEventSignalType;
 
   // Input events
   typedef Signal< void ( Integration::Point&, uint32_t ) > TouchEventSignalType;
@@ -413,11 +411,6 @@ public:
    */
   AccessibilitySignalType& AccessibilitySignal();
 
-  /**
-   * @brief This signal is emitted when window's transition animation is started or ended.
-   */
-  TransitionEffectEventSignalType& TransitionEffectEventSignal();
-
 protected:
 
   // Undefined
@@ -441,7 +434,6 @@ protected:
   SelectionSignalType                  mSelectionDataReceivedSignal;
   StyleSignalType                      mStyleChangedSignal;
   AccessibilitySignalType              mAccessibilitySignal;
-  TransitionEffectEventSignalType      mTransitionEffectEventSignal;
 };
 
 } // namespace Adaptor
index 0db7230..d5f8383 100644 (file)
@@ -86,8 +86,7 @@ Window::Window()
   mResizedSignal(),
   mDeleteRequestSignal(),
   mFocusChangeSignal(),
-  mResizeSignal(),
-  mTransitionEffectEventSignal()
+  mResizeSignal()
 {
 }
 
@@ -114,7 +113,6 @@ void Window::Initialize(const PositionSize& positionSize, const std::string& nam
   mWindowBase->IconifyChangedSignal().Connect( this, &Window::OnIconifyChanged );
   mWindowBase->FocusChangedSignal().Connect( this, &Window::OnFocusChanged );
   mWindowBase->DeleteRequestSignal().Connect( this, &Window::OnDeleteRequest );
-  mWindowBase->TransitionEffectEventSignal().Connect( this, &Window::OnTransitionEffectEvent );
 
   mWindowSurface->OutputTransformedSignal().Connect( this, &Window::OnOutputTransformed );
 
@@ -620,12 +618,6 @@ void Window::OnDeleteRequest()
   mDeleteRequestSignal.Emit();
 }
 
-void Window::OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type )
-{
-  Dali::Window handle( this );
-  mTransitionEffectEventSignal.Emit( handle, state, type );
-}
-
 void Window::OnTouchPoint( Dali::Integration::Point& point, int timeStamp )
 {
   FeedTouchPoint( point, timeStamp );
index cca3643..bebb11b 100644 (file)
@@ -67,7 +67,6 @@ public:
   typedef Dali::Window::ResizedSignalType ResizedSignalType;
   typedef Dali::Window::FocusChangeSignalType FocusChangeSignalType;
   typedef Dali::Window::ResizeSignalType ResizeSignalType;
-  typedef Dali::DevelWindow::TransitionEffectEventSignalType TransitionEffectEventSignalType;
   typedef Signal< void () > SignalType;
 
   /**
@@ -401,11 +400,6 @@ private:
    */
   void OnDeleteRequest();
 
-  /**
-   * Called when the window receives a Transition effect-start/end event.
-   */
-  void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type );
-
 private: // Dali::Internal::Adaptor::SceneHolder
 
   /**
@@ -490,11 +484,6 @@ public: // Signals
    */
   Dali::DevelWindow::EventProcessingFinishedSignalType& EventProcessingFinishedSignal() { return mScene.EventProcessingFinishedSignal(); }
 
-  /**
-   * @copydoc Dali::DevelWindow::TransitionEffectEventSignal()
-   */
-  TransitionEffectEventSignalType& TransitionEffectEventSignal() { return mTransitionEffectEventSignal; }
-
 private:
 
   WindowRenderSurface*                  mWindowSurface;      ///< The window rendering surface
@@ -526,7 +515,6 @@ private:
   SignalType                            mDeleteRequestSignal;
   FocusChangeSignalType                 mFocusChangeSignal;
   ResizeSignalType                      mResizeSignal;
-  TransitionEffectEventSignalType       mTransitionEffectEventSignal;
 };
 
 } // namespace Adaptor
index de1c76d..0149f41 100755 (executable)
@@ -432,46 +432,6 @@ static Eina_Bool EcoreEventDataReceive( void* data, int type, void* event )
 }
 
 /////////////////////////////////////////////////////////////////////////////////////////////////
-// Effect Start/End Callbacks
-/////////////////////////////////////////////////////////////////////////////////////////////////
-
-/**
- * Called when transition animation of the window's shown/hidden is started by window manager.
- */
-static Eina_Bool EcoreEventEffectStart(void *data, int type, void *event)
-{
-  WindowBaseEcoreWl2* windowBase = static_cast< WindowBaseEcoreWl2* >( data );
-  Ecore_Wl2_Event_Effect_Start *effectStart = static_cast<Ecore_Wl2_Event_Effect_Start*>( event );
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::EcoreEventEffectStart, effect type[ %d ]\n", effectStart->type );
-  if( windowBase )
-  {
-    if( effectStart->type < 3 ) // only under restack
-    {
-      windowBase->OnTransitionEffectEvent( DevelWindow::EffectState::START, static_cast<DevelWindow::EffectType>( effectStart->type ) );
-    }
-  }
-  return ECORE_CALLBACK_PASS_ON;
-}
-
-/**
- * Called when transition animation of the window's shown/hidden is ended by window manager.
- */
-static Eina_Bool EcoreEventEffectEnd(void *data, int type, void *event)
-{
-  Ecore_Wl2_Event_Effect_Start *effectEnd = static_cast<Ecore_Wl2_Event_Effect_Start*>( event );
-  WindowBaseEcoreWl2* windowBase = static_cast< WindowBaseEcoreWl2* >( data );
-  DALI_LOG_INFO( gWindowBaseLogFilter, Debug::General, "WindowBaseEcoreWl2::EcoreEventEffectEnd, effect type[ %d ]\n", effectEnd->type );
-  if( windowBase )
-  {
-    if( effectEnd->type < 3 ) // only under restack
-    {
-      windowBase->OnTransitionEffectEvent( DevelWindow::EffectState::END, static_cast<DevelWindow::EffectType>( effectEnd->type ) );
-    }
-  }
-  return ECORE_CALLBACK_PASS_ON;
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////
 // Font Callbacks
 /////////////////////////////////////////////////////////////////////////////////////////////////
 
@@ -747,10 +707,6 @@ void WindowBaseEcoreWl2::Initialize( PositionSize positionSize, Any surface, boo
   mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_DATA_SOURCE_SEND,            EcoreEventDataSend,                  this ) );
   mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_SELECTION_DATA_READY,        EcoreEventDataReceive,               this ) );
 
-  // Register Effect Start/End event
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_EFFECT_START,                EcoreEventEffectStart,               this ) );
-  mEcoreEventHandler.PushBack( ecore_event_handler_add( ECORE_WL2_EVENT_EFFECT_END,                  EcoreEventEffectEnd,                 this ) );
-
   // Register Vconf notify - font name and size
   vconf_notify_key_changed( DALI_VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_NAME, VconfNotifyFontNameChanged, this );
   vconf_notify_key_changed( VCONFKEY_SETAPPL_ACCESSIBILITY_FONT_SIZE, VconfNotifyFontSizeChanged, this );
@@ -1191,11 +1147,6 @@ void WindowBaseEcoreWl2::OnEcoreElDBusAccessibilityNotification( void* context,
 #endif
 }
 
-void WindowBaseEcoreWl2::OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type )
-{
-  mTransitionEffectEventSignal.Emit( state, type );
-}
-
 void WindowBaseEcoreWl2::RegistryGlobalCallback( void* data, struct wl_registry *registry, uint32_t name, const char* interface, uint32_t version )
 {
   if( strcmp( interface, tizen_policy_interface.name ) == 0 )
index b64a873..a9edd4e 100644 (file)
@@ -155,11 +155,6 @@ public:
    */
   void OnFontSizeChanged();
 
-  /**
-   * @brief Called when a transition effect-start/end event is received.
-   */
-  void OnTransitionEffectEvent( DevelWindow::EffectState state, DevelWindow::EffectType type );
-
 #ifdef DALI_ELDBUS_AVAILABLE
   /**
    * @brief Called when Ecore ElDBus accessibility event is received.