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
Add Window::SetLayout method
[platform/core/uifw/dali-adaptor.git]
/
dali
/
internal
/
window-system
/
ubuntu-x11
/
window-base-ecore-x.cpp
diff --git
a/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
b/dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
index
e13f26e
..
39bcf9a
100644
(file)
--- a/
dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
+++ b/
dali/internal/window-system/ubuntu-x11/window-base-ecore-x.cpp
@@
-21,7
+21,6
@@
// INTERNAL HEADERS
#include <dali/internal/window-system/common/window-impl.h>
#include <dali/internal/window-system/common/window-render-surface.h>
// INTERNAL HEADERS
#include <dali/internal/window-system/common/window-impl.h>
#include <dali/internal/window-system/common/window-render-surface.h>
-#include <dali/internal/window-system/common/window-system.h>
#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
// EXTERNAL_HEADERS
#include <dali/internal/window-system/ubuntu-x11/ecore-x-types.h>
// EXTERNAL_HEADERS
@@
-38,7
+37,7
@@
namespace Adaptor
{
namespace
{
{
namespace
{
-const
std::string
DEFAULT_DEVICE_NAME = "";
+const
char*
DEFAULT_DEVICE_NAME = "";
const Device::Class::Type DEFAULT_DEVICE_CLASS = Device::Class::NONE;
const Device::Subclass::Type DEFAULT_DEVICE_SUBCLASS = Device::Subclass::NONE;
const Device::Class::Type DEFAULT_DEVICE_CLASS = Device::Class::NONE;
const Device::Subclass::Type DEFAULT_DEVICE_SUBCLASS = Device::Subclass::NONE;
@@
-272,8
+271,6
@@
WindowBaseEcoreX::~WindowBaseEcoreX()
if(mOwnSurface)
{
ecore_x_window_free(mEcoreWindow);
if(mOwnSurface)
{
ecore_x_window_free(mEcoreWindow);
-
- WindowSystem::Shutdown();
}
}
}
}
@@
-285,8
+282,6
@@
void WindowBaseEcoreX::Initialize(PositionSize positionSize, Any surface, bool i
// if the surface is empty, create a new one.
if(surfaceId == 0)
{
// if the surface is empty, create a new one.
if(surfaceId == 0)
{
- WindowSystem::Initialize();
-
// we own the surface about to created
mOwnSurface = true;
CreateWindow(positionSize, isTransparent);
// we own the surface about to created
mOwnSurface = true;
CreateWindow(positionSize, isTransparent);
@@
-712,6
+707,10
@@
void WindowBaseEcoreX::MoveResize(PositionSize positionSize)
ecore_x_window_move_resize(mEcoreWindow, positionSize.x, positionSize.y, positionSize.width, positionSize.height);
}
ecore_x_window_move_resize(mEcoreWindow, positionSize.x, positionSize.y, positionSize.width, positionSize.height);
}
+void WindowBaseEcoreX::SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan)
+{
+}
+
void WindowBaseEcoreX::SetClass(const std::string& name, const std::string& className)
{
ecore_x_icccm_title_set(mEcoreWindow, name.c_str());
void WindowBaseEcoreX::SetClass(const std::string& name, const std::string& className)
{
ecore_x_icccm_title_set(mEcoreWindow, name.c_str());