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
/
android
/
window-base-android.h
diff --git
a/dali/internal/window-system/android/window-base-android.h
b/dali/internal/window-system/android/window-base-android.h
index
abfe727
..
1f6463d
100644
(file)
--- a/
dali/internal/window-system/android/window-base-android.h
+++ b/
dali/internal/window-system/android/window-base-android.h
@@
-2,7
+2,7
@@
#define DALI_INTERNAL_WINDOWSYSTEM_ANDROID_WINDOW_BASE_ANDROID_H
/*
#define DALI_INTERNAL_WINDOWSYSTEM_ANDROID_WINDOW_BASE_ANDROID_H
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-124,6
+124,11
@@
public:
int GetNativeWindowId() override;
/**
int GetNativeWindowId() override;
/**
+ * @copydoc Dali::Internal::Adaptor::WindowBase::GetNativeWindowResourceId()
+ */
+ std::string GetNativeWindowResourceId() override;
+
+ /**
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow()
*/
EGLNativeWindowType CreateEglWindow(int width, int height) override;
* @copydoc Dali::Internal::Adaptor::WindowBase::CreateEglWindow()
*/
EGLNativeWindowType CreateEglWindow(int width, int height) override;
@@
-173,6
+178,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()
*/
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetClass()
*/
@@
-204,6
+214,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;
@@
-214,6
+229,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;
@@
-384,9
+404,9
@@
public:
int CreateFramePresentedSyncFence() override;
/**
int CreateFramePresentedSyncFence() 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::SetPositionSizeWithAngle()
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::SetPositionSizeWithAngle()