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
[3.0] Modify iconify part for wayland
[platform/core/uifw/dali-adaptor.git]
/
adaptors
/
ecore
/
wayland
/
window-render-surface-ecore-wl.cpp
diff --git
a/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
b/adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
index
48cd10d
..
baf7cb9
100644
(file)
--- a/
adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
+++ b/
adaptors/ecore/wayland/window-render-surface-ecore-wl.cpp
@@
-50,8
+50,7
@@
WindowRenderSurface::WindowRenderSurface( Dali::PositionSize positionSize,
const std::string& name,
bool isTransparent)
: EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
const std::string& name,
bool isTransparent)
: EcoreWlRenderSurface( positionSize, surface, name, isTransparent ),
- mEglWindow( NULL ),
- mNeedToApproveDeiconify( false )
+ mEglWindow( NULL )
{
DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Init( surface );
{
DALI_LOG_INFO( gRenderSurfaceLogFilter, Debug::Verbose, "Creating Window\n" );
Init( surface );
@@
-88,11
+87,6
@@
Ecore_Wl_Window* WindowRenderSurface::GetWlWindow()
return mWlWindow;
}
return mWlWindow;
}
-void WindowRenderSurface::RequestToApproveDeiconify()
-{
- mNeedToApproveDeiconify = true;
-}
-
void WindowRenderSurface::InitializeEgl( EglInterface& eglIf )
{
DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
void WindowRenderSurface::InitializeEgl( EglInterface& eglIf )
{
DALI_LOG_TRACE_METHOD( gRenderSurfaceLogFilter );
@@
-216,15
+210,9
@@
void WindowRenderSurface::PostRender( EglInterface& egl, Integration::GlAbstract
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
eglImpl.SwapBuffers();
Internal::Adaptor::EglImplementation& eglImpl = static_cast<Internal::Adaptor::EglImplementation&>( egl );
eglImpl.SwapBuffers();
- // When the window is deiconified, it approves the deiconify operation to window manager after rendering
- if(mNeedToApproveDeiconify)
+ if( mRenderNotification )
{
{
- // SwapBuffer is desychronized. So make sure to sychronize when window is deiconified.
- glAbstraction.Finish();
-
- //FIXME
-
- mNeedToApproveDeiconify = false;
+ mRenderNotification->Trigger();
}
}
}
}
@@
-255,8
+243,6
@@
void WindowRenderSurface::CreateWlRenderable()
{
DALI_ASSERT_ALWAYS(0 && "Failed to create X window");
}
{
DALI_ASSERT_ALWAYS(0 && "Failed to create X window");
}
-
- //FIXME
}
void WindowRenderSurface::UseExistingRenderable( unsigned int surfaceId )
}
void WindowRenderSurface::UseExistingRenderable( unsigned int surfaceId )