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] Support Ecore-Wayland2
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
ubuntu-x11
/
window-factory-ecore-x.cpp
diff --git
a/dali/internal/window-system/ubuntu-x11/window-base-factory-ecore-x.cpp
b/dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.cpp
similarity index 61%
rename from
dali/internal/window-system/ubuntu-x11/window-base-factory-ecore-x.cpp
rename to
dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.cpp
index
6b59782
..
2a9d086
100644
(file)
--- a/
dali/internal/window-system/ubuntu-x11/window-base-factory-ecore-x.cpp
+++ b/
dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.cpp
@@
-16,7
+16,7
@@
*/
// CLASS HEADER
*/
// CLASS HEADER
-#include <dali/internal/window-system/ubuntu-x11/window-
base-
factory-ecore-x.h>
+#include <dali/internal/window-system/ubuntu-x11/window-factory-ecore-x.h>
// INTERNAL HEADERS
#include <dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h>
// INTERNAL HEADERS
#include <dali/internal/window-system/ubuntu-x11/window-base-ecore-x.h>
@@
-29,16
+29,21
@@
namespace Internal
namespace Adaptor
{
namespace Adaptor
{
-std::unique_ptr<
Dali::Internal::Adaptor::WindowBase > WindowBase
FactoryEcoreX::CreateWindowBase( Window* window, WindowRenderSurface* windowRenderSurface )
+std::unique_ptr<
WindowBase > Window
FactoryEcoreX::CreateWindowBase( Window* window, WindowRenderSurface* windowRenderSurface )
{
return Utils::MakeUnique< WindowBaseEcoreX >( window, windowRenderSurface );
}
{
return Utils::MakeUnique< WindowBaseEcoreX >( window, windowRenderSurface );
}
-// this should be created from somewhere
-std::unique_ptr< WindowBaseFactory > GetWindowBaseFactory()
+std::unique_ptr< IndicatorInterface > WindowFactoryEcoreX::CreateIndicator( Adaptor* adaptor, Dali::Window::WindowOrientation orientation, IndicatorInterface::Observer* observer )
{
{
- // returns WindowBase factory
- return Utils::MakeUnique< WindowBaseFactoryEcoreX >();
+ return std::unique_ptr< IndicatorInterface >( nullptr );
+}
+
+// this should be created from Window impl
+std::unique_ptr< WindowFactory > GetWindowFactory()
+{
+ // returns Window factory
+ return Utils::MakeUnique< WindowFactoryEcoreX >();
}
} // namespace Adaptor
}
} // namespace Adaptor