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
/
tizen-wayland
/
ecore-wl
/
window-base-ecore-wl.cpp
diff --git
a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
index
ddf4ad5
..
fb8bf7f
100644
(file)
--- a/
dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
+++ b/
dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
2
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
3
Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-26,7
+26,6
@@
#include <dali/internal/input/common/key-impl.h>
#include <dali/internal/window-system/common/window-impl.h>
#include <dali/internal/window-system/common/window-render-surface.h>
#include <dali/internal/input/common/key-impl.h>
#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>
// EXTERNAL_HEADERS
#include <Ecore_Input.h>
// EXTERNAL_HEADERS
#include <Ecore_Input.h>
@@
-607,8
+606,6
@@
WindowBaseEcoreWl::~WindowBaseEcoreWl()
if(mOwnSurface)
{
ecore_wl_window_free(mEcoreWindow);
if(mOwnSurface)
{
ecore_wl_window_free(mEcoreWindow);
-
- WindowSystem::Shutdown();
}
}
}
}
@@
-624,8
+621,6
@@
void WindowBaseEcoreWl::Initialize(PositionSize positionSize, Any surface, bool
else
{
// we own the surface about to created
else
{
// we own the surface about to created
- WindowSystem::Initialize();
-
mOwnSurface = true;
CreateWindow(positionSize);
}
mOwnSurface = true;
CreateWindow(positionSize);
}
@@
-1317,6
+1312,10
@@
void WindowBaseEcoreWl::MoveResize(PositionSize positionSize)
ecore_wl_window_update_size(mEcoreWindow, positionSize.width, positionSize.height);
}
ecore_wl_window_update_size(mEcoreWindow, positionSize.width, positionSize.height);
}
+void WindowBaseEcoreWl::SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan)
+{
+}
+
void WindowBaseEcoreWl::SetClass(const std::string& name, const std::string& className)
{
ecore_wl_window_title_set(mEcoreWindow, name.c_str());
void WindowBaseEcoreWl::SetClass(const std::string& name, const std::string& className)
{
ecore_wl_window_title_set(mEcoreWindow, name.c_str());