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
fdb01bd
..
d5f8383
100644
(file)
--- a/
dali/internal/window-system/common/window-impl.cpp
+++ b/
dali/internal/window-system/common/window-impl.cpp
@@
-731,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()