From a5335cb5a0a673c56a158730049937a74fa99630 Mon Sep 17 00:00:00 2001 From: Daekwang Ryu Date: Tue, 24 Apr 2018 15:37:34 +0900 Subject: [PATCH 1/1] Revert "[Tizen] indicator : disable indicator" This reverts commit e5bb44fbbf736ec6c74a6b354ea16e3a875c2b2e. Change-Id: I4bda5f290f2469ba5732ff5947fd470f6544f5da --- .../tizen-wayland/ecore-wl2/window-impl-ecore-wl2.cpp | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-) diff --git a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-impl-ecore-wl2.cpp b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-impl-ecore-wl2.cpp index 269eb1a..4c68f02 100644 --- a/dali/internal/window-system/tizen-wayland/ecore-wl2/window-impl-ecore-wl2.cpp +++ b/dali/internal/window-system/tizen-wayland/ecore-wl2/window-impl-ecore-wl2.cpp @@ -475,9 +475,6 @@ void Window::ShowIndicator( Dali::Window::IndicatorVisibleMode visibleMode ) mIndicatorVisible = visibleMode; - //temp code TODO : need to re-imple dali indicator for EFL 1.20 - mIndicatorVisible = Dali::Window::INVISIBLE; - if ( mIndicatorVisible == Dali::Window::VISIBLE ) { // when the indicator is visible, set proper mode for indicator server according to bg mode @@ -539,8 +536,7 @@ void Window::SetClass(std::string name, std::string klass) Window::Window() : mSurface( NULL ), - //temp code TODO : need to re-imple dali indicator for EFL 1.20 - mIndicatorVisible( Dali::Window::INVISIBLE ), + mIndicatorVisible( Dali::Window::VISIBLE ), mIndicatorIsShown( false ), mShowRotatedIndicatorOnClose( false ), mStarted( false ), @@ -633,10 +629,6 @@ void Window::Initialize(const PositionSize& positionSize, const std::string& nam void Window::DoShowIndicator( Dali::Window::WindowOrientation lastOrientation ) { - // temp code TODO : to implementation for EFL 1.20 - if ( mIndicatorVisible == Dali::Window::INVISIBLE ) - return; - if( mIndicator == NULL ) { if( mIndicatorVisible != Dali::Window::INVISIBLE ) @@ -985,9 +977,7 @@ void Window::RotationDone( int orientation, int width, int height ) void Window::SetIndicatorVisibleMode( Dali::Window::IndicatorVisibleMode mode ) { - // temp code TODO : need to re-imple dali indicator for EFL 1.20 - //mIndicatorVisible = mode; - mIndicatorVisible = Dali::Window::INVISIBLE ; + mIndicatorVisible = mode; } unsigned int Window::GetSupportedAuxiliaryHintCount() const -- 2.7.4