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
[Tizen] Fix unParent Bug
[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
30aaeee
..
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()
{
}
{
}
@@
-462,7
+464,9
@@
void Window::SetSize( Dali::Window::WindowSize size )
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 );
}
@@
-524,8
+528,9
@@
void Window::SetPositionSize( PositionSize positionSize )
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 );
}
}
@@
-590,7
+595,9
@@
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()
@@
-645,12
+652,14
@@
void Window::OnRotation( const RotationEvent& rotation )
SurfaceResized( forceUpdate );
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()
@@
-717,26
+726,25
@@
Dali::Window Window::Get( Dali::Actor actor )
return Dali::Window( windowImpl );
}
return Dali::Window( windowImpl );
}
-
void Window::SetParent( Dali::Window& parent )
{
if ( DALI_UNLIKELY( parent ) )
{
mParentWindow = parent;
void Window::SetParent( Dali::Window& 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()