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
/
common
/
window-base.h
diff --git
a/dali/internal/window-system/common/window-base.h
b/dali/internal/window-system/common/window-base.h
index
6553348
..
3a1784d
100644
(file)
--- a/
dali/internal/window-system/common/window-base.h
+++ b/
dali/internal/window-system/common/window-base.h
@@
-64,6
+64,7
@@
public:
// Window
typedef Signal<void(bool)> IconifySignalType;
// Window
typedef Signal<void(bool)> IconifySignalType;
+ typedef Signal<void(bool)> MaximizeSignalType;
typedef Signal<void(bool)> FocusSignalType;
typedef Signal<void()> OutputSignalType;
typedef Signal<void()> DeleteSignalType;
typedef Signal<void(bool)> FocusSignalType;
typedef Signal<void()> OutputSignalType;
typedef Signal<void()> DeleteSignalType;
@@
-166,6
+167,11
@@
public:
virtual void MoveResize(Dali::PositionSize positionSize) = 0;
/**
virtual void MoveResize(Dali::PositionSize positionSize) = 0;
/**
+ * @copydoc Dali::Window::SetLayout()
+ */
+ virtual void SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan) = 0;
+
+ /**
* @copydoc Dali::Window::SetClass()
*/
virtual void SetClass(const std::string& name, const std::string& className) = 0;
* @copydoc Dali::Window::SetClass()
*/
virtual void SetClass(const std::string& name, const std::string& className) = 0;
@@
-196,6
+202,11
@@
public:
virtual bool IsMaximized() const = 0;
/**
virtual bool IsMaximized() const = 0;
/**
+ * @copydoc Dali::DevelWindow::SetMaximumSize()
+ */
+ virtual void SetMaximumSize(Dali::Window::WindowSize size) = 0;
+
+ /**
* @copydoc Dali::DevelWindow::Minimize()
*/
virtual void Minimize(bool minimize) = 0;
* @copydoc Dali::DevelWindow::Minimize()
*/
virtual void Minimize(bool minimize) = 0;
@@
-206,6
+217,11
@@
public:
virtual bool IsMinimized() const = 0;
/**
virtual bool IsMinimized() const = 0;
/**
+ * @copydoc Dali::DevelWindow::SetMimimumSize()
+ */
+ virtual void SetMimimumSize(Dali::Window::WindowSize size) = 0;
+
+ /**
* @copydoc Dali::Window::SetAvailableOrientations()
*/
virtual void SetAvailableAnlges(const std::vector<int>& angles) = 0;
* @copydoc Dali::Window::SetAvailableOrientations()
*/
virtual void SetAvailableAnlges(const std::vector<int>& angles) = 0;
@@
-343,18
+359,19
@@
public:
virtual void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical) = 0;
/**
virtual void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical) = 0;
/**
- * @brief Return the
orientation of the surface
.
- * @return The orientation
+ * @brief Return the
angle of the window's rotation
.
+ * @return The
window
orientation
*/
*/
- virtual int Get
Orientation
() const = 0;
+ virtual int Get
WindowRotationAngle
() const = 0;
/**
/**
- * @brief Get the screen rotation angle of the window
+ * @brief Get the angle of screen rotation for the window
+ * @return The screen orientation
*/
virtual int GetScreenRotationAngle() = 0;
/**
*/
virtual int GetScreenRotationAngle() = 0;
/**
- * @brief Set the rotation angle of the window
+ * @brief Set the
screen
rotation angle of the window
*/
virtual void SetWindowRotationAngle(int degree) = 0;
*/
virtual void SetWindowRotationAngle(int degree) = 0;
@@
-452,6
+469,11
@@
public:
IconifySignalType& IconifyChangedSignal();
/**
IconifySignalType& IconifyChangedSignal();
/**
+ * @brief This signal is emitted when the window becomes maximized or unmaximized.
+ */
+ MaximizeSignalType& MaximizeChangedSignal();
+
+ /**
* @brief This signal is emitted when the window focus is changed.
*/
FocusSignalType& FocusChangedSignal();
* @brief This signal is emitted when the window focus is changed.
*/
FocusSignalType& FocusChangedSignal();
@@
-540,6
+562,7
@@
protected:
protected:
IconifySignalType mIconifyChangedSignal;
protected:
IconifySignalType mIconifyChangedSignal;
+ MaximizeSignalType mMaximizeChangedSignal;
FocusSignalType mFocusChangedSignal;
OutputSignalType mOutputTransformedSignal;
DeleteSignalType mDeleteRequestSignal;
FocusSignalType mFocusChangedSignal;
OutputSignalType mOutputTransformedSignal;
DeleteSignalType mDeleteRequestSignal;