Change-Id: I28b2b86ee6593ee4546763e59d129ea68b083b21
bool mEcoreEventHander:1;
bool mIsFocusAcceptable:1;
bool mVisible:1;
bool mEcoreEventHander:1;
bool mIsFocusAcceptable:1;
bool mVisible:1;
bool mOpaqueState:1;
bool mResizeEnabled:1;
IndicatorInterface* mIndicator;
bool mOpaqueState:1;
bool mResizeEnabled:1;
IndicatorInterface* mIndicator;
{
if( iconifyChangedEvent->iconified == EINA_TRUE )
{
{
if( iconifyChangedEvent->iconified == EINA_TRUE )
{
- observer->OnWindowHidden();
+ handler->mWindow->mIconified = true;
+ if( handler->mWindow->mVisible )
+ {
+ observer->OnWindowHidden();
+ }
DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Iconfied\n", handler->mEcoreWindow );
}
else
{
DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Iconfied\n", handler->mEcoreWindow );
}
else
{
- observer->OnWindowShown();
+ handler->mWindow->mIconified = false;
+ if( handler->mWindow->mVisible )
+ {
+ observer->OnWindowShown();
+ }
DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Shown\n", handler->mEcoreWindow );
}
handled = ECORE_CALLBACK_DONE;
DALI_LOG_INFO( gWindowLogFilter, Debug::General, "Window (%d) Shown\n", handler->mEcoreWindow );
}
handled = ECORE_CALLBACK_DONE;
mEcoreEventHander( true ),
mIsFocusAcceptable( true ),
mVisible( true ),
mEcoreEventHander( true ),
mIsFocusAcceptable( true ),
mVisible( true ),
mOpaqueState( false ),
mResizeEnabled( false ),
mIndicator( NULL ),
mOpaqueState( false ),
mResizeEnabled( false ),
mIndicator( NULL ),
mVisible = true;
ecore_wl_window_show( mEventHandler->mEcoreWindow );
mVisible = true;
ecore_wl_window_show( mEventHandler->mEcoreWindow );
- // Need an update request
- if( mAdaptor )
- mAdaptor->RequestUpdateOnce();
+ if( mAdaptor )
+ {
+ WindowVisibilityObserver* observer( mAdaptor );
+ observer->OnWindowShown();
+ }
{
mVisible = false;
ecore_wl_window_hide( mEventHandler->mEcoreWindow );
{
mVisible = false;
ecore_wl_window_hide( mEventHandler->mEcoreWindow );
+
+ if( !mIconified )
+ {
+ if( mAdaptor )
+ {
+ WindowVisibilityObserver* observer( mAdaptor );
+ observer->OnWindowHidden();
+ }
+ }
}
bool Window::IsVisible() const
}
bool Window::IsVisible() const
mWMRotationAppSet( false ),
mIsFocusAcceptable( true ),
mVisible( true ),
mWMRotationAppSet( false ),
mIsFocusAcceptable( true ),
mVisible( true ),
mOpaqueState( false ),
mResizeEnabled( true ),
mIndicator( NULL ),
mOpaqueState( false ),
mResizeEnabled( true ),
mIndicator( NULL ),
mEcoreEventHander( true ),
mIsFocusAcceptable( true ),
mVisible( true ),
mEcoreEventHander( true ),
mIsFocusAcceptable( true ),
mVisible( true ),
mOpaqueState( false ),
mResizeEnabled( true ),
mIndicator( NULL ),
mOpaqueState( false ),
mResizeEnabled( true ),
mIndicator( NULL ),