projects
/
platform
/
core
/
uifw
/
dali-adaptor.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Revert "[Tizen] Add Effect Start/End signal"
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
common
/
window-impl.cpp
diff --git
a/dali/internal/window-system/common/window-impl.cpp
b/dali/internal/window-system/common/window-impl.cpp
index
4411ffa
..
d5f8383
100644
(file)
--- a/
dali/internal/window-system/common/window-impl.cpp
+++ b/
dali/internal/window-system/common/window-impl.cpp
@@
-84,7
+84,9
@@
Window::Window()
mWindowHeight( 0 ),
mFocusChangedSignal(),
mResizedSignal(),
mWindowHeight( 0 ),
mFocusChangedSignal(),
mResizedSignal(),
- mDeleteRequestSignal()
+ mDeleteRequestSignal(),
+ mFocusChangeSignal(),
+ mResizeSignal()
{
}
{
}
@@
-452,11
+454,19
@@
void Window::SetSize( Dali::Window::WindowSize size )
{
Uint16Pair newSize( newRect.width, newRect.height );
{
Uint16Pair newSize( newRect.width, newRect.height );
- SurfaceResized();
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
+
+ SurfaceResized( forceUpdate );
mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize );
mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize );
+ Dali::Window handle( this );
mResizedSignal.Emit( newSize );
mResizedSignal.Emit( newSize );
+ mResizeSignal.Emit( handle, newSize );
mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize );
}
mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize );
}
@@
-508,12
+518,19
@@
void Window::SetPositionSize( PositionSize positionSize )
{
Uint16Pair newSize( newRect.width, newRect.height );
{
Uint16Pair newSize( newRect.width, newRect.height );
- SurfaceResized();
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
+
+ SurfaceResized( forceUpdate );
mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize );
mAdaptor->SurfaceResizePrepare( mSurface.get(), newSize );
+ Dali::Window handle( this );
mResizedSignal.Emit( newSize );
mResizedSignal.Emit( newSize );
-
+ mResizeSignal.Emit( handle, newSize );
mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize );
}
}
mAdaptor->SurfaceResizeComplete( mSurface.get(), newSize );
}
}
@@
-578,13
+595,20
@@
void Window::OnIconifyChanged( bool iconified )
void Window::OnFocusChanged( bool focusIn )
{
void Window::OnFocusChanged( bool focusIn )
{
+ Dali::Window handle( this );
mFocusChangedSignal.Emit( focusIn );
mFocusChangedSignal.Emit( focusIn );
+ mFocusChangeSignal.Emit( handle, focusIn );
}
void Window::OnOutputTransformed()
{
}
void Window::OnOutputTransformed()
{
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
PositionSize positionSize = mSurface->GetPositionSize();
PositionSize positionSize = mSurface->GetPositionSize();
- SurfaceResized();
+ SurfaceResized(
forceUpdate
);
mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) );
mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) );
}
mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) );
mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( positionSize.width, positionSize.height ) );
}
@@
-620,14
+644,22
@@
void Window::OnRotation( const RotationEvent& rotation )
mWindowSurface->RequestRotation( mRotationAngle, mWindowWidth, mWindowHeight );
mWindowSurface->RequestRotation( mRotationAngle, mWindowWidth, mWindowHeight );
- SurfaceResized();
+ bool forceUpdate = false;
+ if( mWindowBase->IsEglWindowRotationSupported() )
+ {
+ forceUpdate = true;
+ }
+
+ SurfaceResized( forceUpdate );
- mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( m
RotationAngle
, mWindowHeight ) );
+ mAdaptor->SurfaceResizePrepare( mSurface.get(), Adaptor::SurfaceSize( m
WindowWidth
, mWindowHeight ) );
// Emit signal
// Emit signal
- mResizedSignal.Emit( Dali::Window::WindowSize( mRotationAngle, mWindowHeight ) );
+ Dali::Window handle( this );
+ mResizedSignal.Emit( Dali::Window::WindowSize( mWindowWidth, mWindowHeight ) );
+ mResizeSignal.Emit( handle, Dali::Window::WindowSize( mWindowWidth, mWindowHeight ) );
- mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( m
RotationAngle
, mWindowHeight ) );
+ mAdaptor->SurfaceResizeComplete( mSurface.get(), Adaptor::SurfaceSize( m
WindowWidth
, mWindowHeight ) );
}
void Window::OnPause()
}
void Window::OnPause()
@@
-699,20
+731,20
@@
void Window::SetParent( Dali::Window& parent )
if ( DALI_UNLIKELY( parent ) )
{
mParentWindow = parent;
if ( DALI_UNLIKELY( parent ) )
{
mParentWindow = parent;
- Dali::Window
grandParent = Dali::DevelWindow::GetParent( parent
);
+ Dali::Window
self = Dali::Window( this
);
// check circular parent window setting
// check circular parent window setting
- if ( D
ALI_UNLIKELY( grandParent ) && mWindowBase->IsMatchedWindow( grandParent.GetNativeHandle() )
)
+ if ( D
ali::DevelWindow::GetParent( parent ) == self
)
{
Dali::DevelWindow::Unparent( parent );
}
{
Dali::DevelWindow::Unparent( parent );
}
- mWindowBase->SetParent(
parent.GetNativeHandle()
);
+ mWindowBase->SetParent(
GetImplementation( mParentWindow ).mWindowBase
);
}
}
void Window::Unparent()
{
}
}
void Window::Unparent()
{
-
Any parent
;
- m
WindowBase->SetParent( parent
);
+
mWindowBase->SetParent( nullptr )
;
+ m
ParentWindow.Reset(
);
}
Dali::Window Window::GetParent()
}
Dali::Window Window::GetParent()