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
/
windows
/
window-base-win.h
diff --git
a/dali/internal/window-system/windows/window-base-win.h
b/dali/internal/window-system/windows/window-base-win.h
index
bbc403f
..
90c8d21
100644
(file)
--- a/
dali/internal/window-system/windows/window-base-win.h
+++ b/
dali/internal/window-system/windows/window-base-win.h
@@
-114,7
+114,7
@@
public:
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowResourceId()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowResourceId()
*/
- std:string GetNativeWindowResourceId() override;
+ std:
:
string GetNativeWindowResourceId() override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow()
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow()
@@
-167,6
+167,11
@@
public:
void MoveResize(PositionSize positionSize) override;
/**
void MoveResize(PositionSize positionSize) override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::SetLayout()
+ */
+ void SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan) override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
*/
void SetClass(const std::string& name, const std::string& className) override;
* @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
*/
void SetClass(const std::string& name, const std::string& className) override;
@@
-197,6
+202,11
@@
public:
bool IsMaximized() const override;
/**
bool IsMaximized() const override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::SetMaximumSize()
+ */
+ void SetMaximumSize(Dali::Window::WindowSize size) override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::Minimize()
*/
void Minimize(bool minimize) override;
* @copydoc Dali::Internal::Adaptor::WindowBase::Minimize()
*/
void Minimize(bool minimize) override;
@@
-207,6
+217,11
@@
public:
bool IsMinimized() const override;
/**
bool IsMinimized() const override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::SetMimimumSize()
+ */
+ void SetMimimumSize(Dali::Window::WindowSize size) override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges()
*/
void SetAvailableAnlges(const std::vector<int>& angles) override;
* @copydoc Dali::Internal::Adaptor::WindowBase::SetAvailableAnlges()
*/
void SetAvailableAnlges(const std::vector<int>& angles) override;
@@
-362,9
+377,9
@@
public:
void SetTransparency(bool transparent) override;
/**
void SetTransparency(bool transparent) override;
/**
- * @copydoc Dali::Internal::Adaptor::WindowBase::Get
Orientation
()
+ * @copydoc Dali::Internal::Adaptor::WindowBase::Get
WindowRotationAngle
()
*/
*/
- int Get
Orientation
() const override;
+ int Get
WindowRotationAngle
() const override;
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetParent()