From: greynaga Date: Fri, 13 Oct 2017 14:00:27 +0000 (+0100) Subject: [dali_1.2.61] Merge branch 'devel/master' X-Git-Tag: dali_1.9.21~149 X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-adaptor.git;a=commitdiff_plain;h=b9d603bd9eef23cc047958318229c633e8c54c5b;hp=e54576f7b80885044d67ec147ab2742e31b75546 [dali_1.2.61] Merge branch 'devel/master' Change-Id: Idbeba52924ddcaefd27918ec02fe8e855f6b02b4 --- diff --git a/adaptors/base/environment-options.cpp b/adaptors/base/environment-options.cpp index fef700d..c96edeb 100644 --- a/adaptors/base/environment-options.cpp +++ b/adaptors/base/environment-options.cpp @@ -109,6 +109,7 @@ EnvironmentOptions::EnvironmentOptions() mGlesCallAccumulate( false ), mMultiSamplingLevel( 0 ), mMaxTextureSize( 0 ), + mIndicatorVisibleMode( -1 ), mLogFunction( NULL ) { ParseEnvironmentOptions(); @@ -265,6 +266,11 @@ unsigned int EnvironmentOptions::GetMaxTextureSize() const return mMaxTextureSize; } +int EnvironmentOptions::GetIndicatorVisibleMode() const +{ + return mIndicatorVisibleMode; +} + bool EnvironmentOptions::PerformanceServerRequired() const { return ( ( GetPerformanceStatsLoggingOptions() > 0) || @@ -424,6 +430,15 @@ void EnvironmentOptions::ParseEnvironmentOptions() mMaxTextureSize = maxTextureSize; } } + + int indicatorVisibleMode( -1 ); + if( GetIntegerEnvironmentVariable( DALI_ENV_INDICATOR_VISIBLE_MODE, indicatorVisibleMode ) ) + { + if( indicatorVisibleMode > -1 ) + { + mIndicatorVisibleMode = indicatorVisibleMode; + } + } } } // Adaptor diff --git a/adaptors/base/environment-options.h b/adaptors/base/environment-options.h index 2ab19a9..42022fd 100644 --- a/adaptors/base/environment-options.h +++ b/adaptors/base/environment-options.h @@ -213,6 +213,11 @@ public: */ unsigned int GetMaxTextureSize() const; + /** + * @return The maximum texture size + */ + int GetIndicatorVisibleMode() const; + private: // Internal /** @@ -250,6 +255,7 @@ private: // Data bool mGlesCallAccumulate; ///< Whether or not to accumulate gles call statistics unsigned int mMultiSamplingLevel; ///< The number of samples required in multisample buffers unsigned int mMaxTextureSize; ///< The maximum texture size that GL can handle + int mIndicatorVisibleMode; ///< Indicator visible mode Dali::Integration::Log::LogFunction mLogFunction; diff --git a/adaptors/base/environment-variables.h b/adaptors/base/environment-variables.h index 53fe21b..72b4834 100644 --- a/adaptors/base/environment-variables.h +++ b/adaptors/base/environment-variables.h @@ -97,6 +97,8 @@ namespace Adaptor #define DALI_ENV_MAX_TEXTURE_SIZE "DALI_MAX_TEXTURE_SIZE" +#define DALI_ENV_INDICATOR_VISIBLE_MODE "DALI_INDICATOR_VISIBLE_MODE" + } // namespace Adaptor } // namespace Internal diff --git a/adaptors/common/application-impl.cpp b/adaptors/common/application-impl.cpp index 5e73d5e..0798462 100644 --- a/adaptors/common/application-impl.cpp +++ b/adaptors/common/application-impl.cpp @@ -146,6 +146,12 @@ void Application::CreateWindow() const std::string& windowClassName = mEnvironmentOptions.GetWindowClassName(); mWindow = Dali::Window::New( mWindowPositionSize, mName, windowClassName, mWindowMode == Dali::Application::TRANSPARENT ); + int indicatorVisibleMode = mEnvironmentOptions.GetIndicatorVisibleMode(); + if( indicatorVisibleMode >= Dali::Window::INVISIBLE && indicatorVisibleMode <= Dali::Window::AUTO ) + { + GetImplementation( mWindow ).SetIndicatorVisibleMode( static_cast< Dali::Window::IndicatorVisibleMode >( indicatorVisibleMode ) ); + } + // Quit the application when the window is closed GetImplementation( mWindow ).DeleteRequestSignal().Connect( mSlotDelegate, &Application::Quit ); } @@ -400,7 +406,13 @@ void Application::ReplaceWindow( const PositionSize& positionSize, const std::st Dali::Window newWindow = Dali::Window::New( positionSize, name, mWindowMode == Dali::Application::TRANSPARENT ); Window& windowImpl = GetImplementation(newWindow); windowImpl.SetAdaptor(*mAdaptor); - newWindow.ShowIndicator(Dali::Window::INVISIBLE); + + int indicatorVisibleMode = mEnvironmentOptions.GetIndicatorVisibleMode(); + if( indicatorVisibleMode >= Dali::Window::INVISIBLE && indicatorVisibleMode <= Dali::Window::AUTO ) + { + GetImplementation( newWindow ).SetIndicatorVisibleMode( static_cast< Dali::Window::IndicatorVisibleMode >( indicatorVisibleMode ) ); + } + Dali::RenderSurface* renderSurface = windowImpl.GetSurface(); Any nativeWindow = newWindow.GetNativeHandle(); diff --git a/adaptors/common/window-impl.h b/adaptors/common/window-impl.h index bd04b98..12de6a0 100644 --- a/adaptors/common/window-impl.h +++ b/adaptors/common/window-impl.h @@ -304,6 +304,11 @@ public: */ void RotationDone( int orientation, int width, int height ); + /** + * Set the indicator visible mode + */ + void SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode ); + private: /** * Private constructor. diff --git a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp index 9d8d5b4..9790533 100644 --- a/adaptors/ecore/wayland/event-handler-ecore-wl.cpp +++ b/adaptors/ecore/wayland/event-handler-ecore-wl.cpp @@ -288,6 +288,18 @@ void GetDeviceSubclass( Ecore_Device_Subclass ecoreDeviceSubclass, Device::Subcl deviceSubclass = Device::Subclass::TRACKBALL; break; } +#ifdef OVER_TIZEN_VERSION_4 + case ECORE_DEVICE_SUBCLASS_REMOCON: + { + deviceSubclass = Device::Subclass::REMOCON; + break; + } + case ECORE_DEVICE_SUBCLASS_VIRTUAL_KEYBOARD: + { + deviceSubclass = Device::Subclass::VIRTUAL_KEYBOARD; + break; + } +#endif default: { deviceSubclass = Device::Subclass::NONE; diff --git a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp index fefbd0e..d1ba238 100644 --- a/adaptors/ecore/wayland/window-impl-ecore-wl.cpp +++ b/adaptors/ecore/wayland/window-impl-ecore-wl.cpp @@ -908,6 +908,11 @@ void Window::RotationDone( int orientation, int width, int height ) mAdaptor->SurfaceResizeComplete( Adaptor::SurfaceSize( width, height ) ); } +void Window::SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode ) +{ + mIndicatorVisible = mode; +} + unsigned int Window::GetSupportedAuxiliaryHintCount() const { return mSupportedAuxiliaryHints.size(); diff --git a/adaptors/public-api/dali-adaptor-version.cpp b/adaptors/public-api/dali-adaptor-version.cpp index 9596bfa..c6596f4 100644 --- a/adaptors/public-api/dali-adaptor-version.cpp +++ b/adaptors/public-api/dali-adaptor-version.cpp @@ -28,7 +28,7 @@ namespace Dali const unsigned int ADAPTOR_MAJOR_VERSION = 1; const unsigned int ADAPTOR_MINOR_VERSION = 2; -const unsigned int ADAPTOR_MICRO_VERSION = 60; +const unsigned int ADAPTOR_MICRO_VERSION = 61; const char * const ADAPTOR_BUILD_DATE = __DATE__ " " __TIME__; #ifdef DEBUG_ENABLED diff --git a/adaptors/wayland/window-impl-wl.cpp b/adaptors/wayland/window-impl-wl.cpp index 13cda8d..875f5cb 100644 --- a/adaptors/wayland/window-impl-wl.cpp +++ b/adaptors/wayland/window-impl-wl.cpp @@ -318,6 +318,11 @@ void Window::RotationDone( int orientation, int width, int height ) { } +void Window::SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode ) +{ + mIndicatorVisible = mode; +} + unsigned int Window::GetSupportedAuxiliaryHintCount() const { return 0; diff --git a/adaptors/x11/window-impl-x.cpp b/adaptors/x11/window-impl-x.cpp index 9571725..4820b36 100644 --- a/adaptors/x11/window-impl-x.cpp +++ b/adaptors/x11/window-impl-x.cpp @@ -819,6 +819,11 @@ void Window::RotationDone( int orientation, int width, int height ) } } +void Window::SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode ) +{ + mIndicatorVisible = mode; +} + unsigned int Window::GetSupportedAuxiliaryHintCount() const { return 0; diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp index c4bc01d..02439bc 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.cpp @@ -85,6 +85,7 @@ void TestGlAbstraction::Initialize() mEnableDisableTrace.Reset(); mShaderTrace.Reset(); mStencilFunctionTrace.Reset(); + mScissorTrace.Reset(); mTextureTrace.Reset(); mTexParamaterTrace.Reset(); mDrawTrace.Reset(); diff --git a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h index 8408b10..b306c3e 100644 --- a/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h +++ b/automated-tests/src/dali-adaptor/dali-test-suite-utils/test-gl-abstraction.h @@ -949,6 +949,15 @@ public: mScissorParams.y = y; mScissorParams.width = width; mScissorParams.height = height; + + std::stringstream out; + out << x << ", " << y << ", " << width << ", " << height; + TraceCallStack::NamedParams namedParams; + namedParams["x"] = ToString( x ); + namedParams["y"] = ToString( y ); + namedParams["width"] = ToString( width ); + namedParams["height"] = ToString( height ); + mScissorTrace.PushCall( "Scissor", out.str(), namedParams ); } inline void ShaderBinary(GLsizei n, const GLuint* shaders, GLenum binaryformat, const void* binary, GLsizei length) @@ -1951,6 +1960,11 @@ public: // TEST FUNCTIONS inline void ResetStencilFunctionCallStack() { mStencilFunctionTrace.Reset(); } inline TraceCallStack& GetStencilFunctionTrace() { return mStencilFunctionTrace; } + //Methods for Scissor verification + inline void EnableScissorCallTrace(bool enable) { mScissorTrace.Enable(enable); } + inline void ResetScissorCallStack() { mScissorTrace.Reset(); } + inline TraceCallStack& GetScissorTrace() { return mScissorTrace; } + //Methods for Uniform function verification inline void EnableSetUniformCallTrace(bool enable) { mSetUniformTrace.Enable(enable); } inline void ResetSetUniformCallStack() { mSetUniformTrace.Reset(); } @@ -2189,6 +2203,7 @@ private: TraceCallStack mDrawTrace; TraceCallStack mDepthFunctionTrace; TraceCallStack mStencilFunctionTrace; + TraceCallStack mScissorTrace; TraceCallStack mSetUniformTrace; // Shaders & Uniforms diff --git a/packaging/dali-adaptor.spec b/packaging/dali-adaptor.spec index da98239..cafb34c 100644 --- a/packaging/dali-adaptor.spec +++ b/packaging/dali-adaptor.spec @@ -19,7 +19,7 @@ Name: dali-adaptor Summary: The DALi Tizen Adaptor -Version: 1.2.60 +Version: 1.2.61 Release: 1 Group: System/Libraries License: Apache-2.0 and BSD-3-Clause and MIT