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.h
diff --git
a/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
b/dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
index
6bdbd10
..
94ad113
100644
(file)
--- a/
dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
+++ b/
dali/internal/window-system/tizen-wayland/ecore-wl/window-base-ecore-wl.h
@@
-2,7
+2,7
@@
#define DALI_INTERNAL_WINDOWSYSTEM_TIZENWAYLAND_WINDOW_BASE_ECORE_WL_H
/*
#define DALI_INTERNAL_WINDOWSYSTEM_TIZENWAYLAND_WINDOW_BASE_ECORE_WL_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.
@@
-27,10
+27,6
@@
#include <tizen-extension-client-protocol.h>
#include <wayland-egl.h>
#include <tizen-extension-client-protocol.h>
#include <wayland-egl.h>
-#ifdef DALI_ELDBUS_AVAILABLE
-#include <Eldbus.h>
-#endif
-
namespace Dali
{
namespace Internal
namespace Dali
{
namespace Internal
@@
-147,13
+143,6
@@
public:
*/
void OnFontSizeChanged();
*/
void OnFontSizeChanged();
-#ifdef DALI_ELDBUS_AVAILABLE
- /**
- * @brief Called when Ecore ElDBus accessibility event is received.
- */
- void OnEcoreElDBusAccessibilityNotification(void* context, const Eldbus_Message* message);
-#endif
-
/**
* @brief RegistryGlobalCallback
*/
/**
* @brief RegistryGlobalCallback
*/
@@
-191,6
+180,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;
@@
-240,6
+234,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()
*/
@@
-271,6
+270,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;
@@
-281,6
+285,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;
@@
-416,9
+425,9
@@
public:
void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical) override;
/**
void GetDpi(unsigned int& dpiHorizontal, unsigned int& dpiVertical) 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::GetScreenRotationAngle()
/**
* @copydoc Dali::Internal::Adaptor::WindowBase::GetScreenRotationAngle()
@@
-507,11
+516,6
@@
private:
void Initialize(PositionSize positionSize, Any surface, bool isTransparent);
/**
void Initialize(PositionSize positionSize, Any surface, bool isTransparent);
/**
- * Initialize Ecore ElDBus
- */
- void InitializeEcoreElDBus();
-
- /**
* @brief Create window
*/
void CreateWindow(PositionSize positionSize);
* @brief Create window
*/
void CreateWindow(PositionSize positionSize);
@@
-556,9
+560,6
@@
private:
int mWindowRotationAngle;
int mScreenRotationAngle;
int mSupportedPreProtation;
int mWindowRotationAngle;
int mScreenRotationAngle;
int mSupportedPreProtation;
-#ifdef DALI_ELDBUS_AVAILABLE
- Eldbus_Connection* mSystemConnection;
-#endif // DALI_ELDBUS_AVAILABLE
};
} // namespace Adaptor
};
} // namespace Adaptor