From 88b460eab34ce84f7e15c12ff3751356126041c1 Mon Sep 17 00:00:00 2001 From: Sunghyun kim Date: Fri, 14 Jun 2019 09:54:16 +0900 Subject: [PATCH] [Tizen]Revert "Basic support of keyboard focus for multiple windows" This reverts commit 8364cef120b565c63fb38e6366ca1bce0c15f45d. Change-Id: I4442bd207cd3bf25130e89474ad7194661d40c42 --- dali/devel-api/adaptor-framework/window-devel.h | 2 +- dali/integration-api/adaptor.h | 16 ------------- dali/internal/adaptor/common/adaptor-impl.cpp | 31 ------------------------- dali/internal/adaptor/common/adaptor-impl.h | 19 ++------------- dali/internal/adaptor/common/adaptor.cpp | 10 -------- 5 files changed, 3 insertions(+), 75 deletions(-) diff --git a/dali/devel-api/adaptor-framework/window-devel.h b/dali/devel-api/adaptor-framework/window-devel.h index 3da549e..bbdac10 100644 --- a/dali/devel-api/adaptor-framework/window-devel.h +++ b/dali/devel-api/adaptor-framework/window-devel.h @@ -53,7 +53,7 @@ DALI_ADAPTOR_API void SetPositionSize( Window window, PositionSize positionSize * @param[in] window The window instance * @return A valid handle to a RenderTaskList */ -DALI_ADAPTOR_API Dali::RenderTaskList GetRenderTaskList( Window window ); +Dali::RenderTaskList GetRenderTaskList( Window window ); /** * @brief Retrieve the window that the given actor is added to. diff --git a/dali/integration-api/adaptor.h b/dali/integration-api/adaptor.h index 570ff19..25b5a6b 100755 --- a/dali/integration-api/adaptor.h +++ b/dali/integration-api/adaptor.h @@ -44,8 +44,6 @@ namespace Dali class RenderSurfaceInterface; -using WindowContainer = std::vector; - namespace Integration { class SceneHolder; @@ -124,7 +122,6 @@ class DALI_ADAPTOR_API Adaptor public: typedef Signal< void (Adaptor&) > AdaptorSignalType; ///< Generic Type for adaptor signals - typedef Signal< void (Window&) > WindowCreatedSignalType; ///< Window created signal type public: /** @@ -430,12 +427,6 @@ public: */ void UnregisterProcessor( Integration::Processor& processor ); - /** - * @brief Get the list of windows created. - * @return The list of windows - */ - Dali::WindowContainer GetWindows() const; - public: // Signals /** @@ -453,13 +444,6 @@ public: // Signals */ AdaptorSignalType& LanguageChangedSignal(); - /** - * @brief This signal is emitted when a new window is created - * - * @return The signal to connect to - */ - WindowCreatedSignalType& WindowCreatedSignal(); - private: // Undefined diff --git a/dali/internal/adaptor/common/adaptor-impl.cpp b/dali/internal/adaptor/common/adaptor-impl.cpp index 28417ee..6bce4d5 100755 --- a/dali/internal/adaptor/common/adaptor-impl.cpp +++ b/dali/internal/adaptor/common/adaptor-impl.cpp @@ -182,12 +182,6 @@ void Adaptor::Initialize( GraphicsFactory& graphicsFactory, Dali::Configuration: defaultWindow->SetAdaptor( Get() ); - Dali::Window window( dynamic_cast( ( &defaultWindow )->Get() ) ); - if ( window ) - { - mWindowCreatedSignal.Emit( window ); - } - const unsigned int timeInterval = mEnvironmentOptions->GetObjectProfilerInterval(); if( 0u < timeInterval ) { @@ -578,13 +572,6 @@ bool Adaptor::AddWindow( Dali::Integration::SceneHolder* childWindow, const std: // Add the new Window to the container - the order is not important mWindows.push_back( SceneHolderPtr( &windowImpl ) ); - - Dali::Window window( dynamic_cast( &windowImpl ) ); - if ( window ) - { - mWindowCreatedSignal.Emit( window ); - } - return true; } @@ -1021,27 +1008,9 @@ Dali::Internal::Adaptor::SceneHolder* Adaptor::GetWindow( Dali::Actor& actor ) return nullptr; } -Dali::WindowContainer Adaptor::GetWindows() const -{ - Dali::WindowContainer windows; - - for ( auto iter = mWindows.begin(); iter != mWindows.end(); ++iter ) - { - // Downcast to Dali::Window - Dali::Window window( dynamic_cast( iter->Get() ) ); - if ( window ) - { - windows.push_back( window ); - } - } - - return windows; -} - Adaptor::Adaptor(Dali::Integration::SceneHolder window, Dali::Adaptor& adaptor, Dali::RenderSurfaceInterface* surface, EnvironmentOptions* environmentOptions) : mResizedSignal(), mLanguageChangedSignal(), - mWindowCreatedSignal(), mAdaptor( adaptor ), mState( READY ), mCore( nullptr ), diff --git a/dali/internal/adaptor/common/adaptor-impl.h b/dali/internal/adaptor/common/adaptor-impl.h index d36f8a6..29bb7d5 100755 --- a/dali/internal/adaptor/common/adaptor-impl.h +++ b/dali/internal/adaptor/common/adaptor-impl.h @@ -97,10 +97,9 @@ class Adaptor : public Integration::RenderController, { public: - using AdaptorSignalType = Dali::Adaptor::AdaptorSignalType; - using WindowCreatedSignalType = Dali::Adaptor::WindowCreatedSignalType; + typedef Dali::Adaptor::AdaptorSignalType AdaptorSignalType; - using SurfaceSize = Uint16Pair; ///< Surface size type + typedef Uint16Pair SurfaceSize; ///< Surface size type /** * Creates a New Adaptor @@ -303,11 +302,6 @@ public: // AdaptorInternalServices implementation */ Dali::Internal::Adaptor::SceneHolder* GetWindow( Dali::Actor& actor ); - /** - * @copydoc Dali::Adaptor::GetWindows() - */ - Dali::WindowContainer GetWindows() const; - public: /** @@ -509,14 +503,6 @@ public: // Signals return mLanguageChangedSignal; } - /** - * @copydoc Dali::Adaptor::WindowCreatedSignal - */ - WindowCreatedSignalType& WindowCreatedSignal() - { - return mWindowCreatedSignal; - } - public: // From Dali::Internal::Adaptor::CoreEventInterface /** @@ -646,7 +632,6 @@ private: // Data AdaptorSignalType mResizedSignal; ///< Resized signal. AdaptorSignalType mLanguageChangedSignal; ///< Language changed signal. - WindowCreatedSignalType mWindowCreatedSignal; ///< Window created signal. Dali::Adaptor& mAdaptor; ///< Reference to public adaptor instance. State mState; ///< Current state of the adaptor diff --git a/dali/internal/adaptor/common/adaptor.cpp b/dali/internal/adaptor/common/adaptor.cpp index 17b0805..a183350 100755 --- a/dali/internal/adaptor/common/adaptor.cpp +++ b/dali/internal/adaptor/common/adaptor.cpp @@ -141,11 +141,6 @@ Adaptor::AdaptorSignalType& Adaptor::LanguageChangedSignal() return mImpl->LanguageChangedSignal(); } -Adaptor::WindowCreatedSignalType& Adaptor::WindowCreatedSignal() -{ - return mImpl->WindowCreatedSignal(); -} - Dali::RenderSurfaceInterface& Adaptor::GetSurface() { return mImpl->GetSurface(); @@ -241,11 +236,6 @@ void Adaptor::UnregisterProcessor( Integration::Processor& processor ) mImpl->UnregisterProcessor( processor ); } -Dali::WindowContainer Adaptor::GetWindows() const -{ - return mImpl->GetWindows(); -} - Adaptor::Adaptor() : mImpl( NULL ) { -- 2.7.4