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-impl.cpp
diff --git
a/dali/internal/window-system/common/window-impl.cpp
b/dali/internal/window-system/common/window-impl.cpp
index
673f0bd
..
a309df3
100644
(file)
--- a/
dali/internal/window-system/common/window-impl.cpp
+++ b/
dali/internal/window-system/common/window-impl.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.
@@
-196,6
+196,16
@@
void Window::Initialize(Any surface, const PositionSize& positionSize, const std
mNativeWindowId = mWindowBase->GetNativeWindowId();
}
mNativeWindowId = mWindowBase->GetNativeWindowId();
}
+void Window::SetRenderNotification(TriggerEventInterface *renderNotification)
+{
+ if(!mWindowSurface)
+ {
+ return;
+ }
+
+ mWindowSurface->SetRenderNotification(renderNotification);
+}
+
void Window::OnAdaptorSet(Dali::Adaptor& adaptor)
{
mEventHandler = EventHandlerPtr(new EventHandler(mWindowSurface->GetWindowBase(), *mAdaptor));
void Window::OnAdaptorSet(Dali::Adaptor& adaptor)
{
mEventHandler = EventHandlerPtr(new EventHandler(mWindowSurface->GetWindowBase(), *mAdaptor));
@@
-721,7
+731,7
@@
void Window::SetPosition(Dali::Window::WindowPosition position)
int32_t newX = position.GetX();
int32_t newY = position.GetY();
int32_t newX = position.GetX();
int32_t newY = position.GetY();
- mWindowSurface->Move
Resize
(PositionSize(newX, newY, oldRect.width, oldRect.height));
+ mWindowSurface->Move(PositionSize(newX, newY, oldRect.width, oldRect.height));
if((oldRect.x != newX) || (oldRect.y != newY))
{
if((oldRect.x != newX) || (oldRect.y != newY))
{
@@
-805,6
+815,11
@@
void Window::SetPositionSize(PositionSize positionSize)
Dali::Accessibility::Accessible::Get(mScene.GetRootLayer())->EmitBoundsChanged(Dali::Rect<>(positionSize.x, positionSize.y, positionSize.width, positionSize.height));
}
Dali::Accessibility::Accessible::Get(mScene.GetRootLayer())->EmitBoundsChanged(Dali::Rect<>(positionSize.x, positionSize.y, positionSize.width, positionSize.height));
}
+void Window::SetLayout(unsigned int numCols, unsigned int numRows, unsigned int column, unsigned int row, unsigned int colSpan, unsigned int rowSpan)
+{
+ mWindowBase->SetLayout(numCols, numRows, column, row, colSpan, rowSpan);
+}
+
Dali::Layer Window::GetRootLayer() const
{
return mScene.GetRootLayer();
Dali::Layer Window::GetRootLayer() const
{
return mScene.GetRootLayer();
@@
-837,8
+852,8
@@
bool Window::UngrabKeyList(const Dali::Vector<Dali::KEY>& key, Dali::Vector<bool
void Window::OnIconifyChanged(bool iconified)
{
void Window::OnIconifyChanged(bool iconified)
{
- const bool isActuallyChanged = (iconified != mIconified);
- auto
bridge
= Dali::Accessibility::Bridge::GetCurrentBridge();
+ const bool
isActuallyChanged = (iconified != mIconified);
+ auto
bridge
= Dali::Accessibility::Bridge::GetCurrentBridge();
Dali::Window handle(this);
if(iconified)
Dali::Window handle(this);
if(iconified)
@@
-891,7
+906,7
@@
void Window::OnMaximizeChanged(bool maximized)
if(isActuallyChanged)
{
if(isActuallyChanged)
{
- auto bridge = Dali::Accessibility::Bridge::GetCurrentBridge();
+ auto
bridge = Dali::Accessibility::Bridge::GetCurrentBridge();
Dali::Window handle(this);
if(maximized)
Dali::Window handle(this);
if(maximized)
@@
-1116,9
+1131,8
@@
void Window::OnAccessibilityDisabled()
bridge->RemoveTopLevelWindow(accessible);
}
bridge->RemoveTopLevelWindow(accessible);
}
-
void Window::RecalculateTouchPosition(Integration::Point& point
)
+
Vector2 Window::RecalculatePosition(const Vector2& position
)
{
{
- Vector2 position = point.GetScreenPosition();
Vector2 convertedPosition;
switch(mRotationAngle)
Vector2 convertedPosition;
switch(mRotationAngle)
@@
-1147,8
+1161,7
@@
void Window::RecalculateTouchPosition(Integration::Point& point)
break;
}
}
break;
}
}
-
- point.SetScreenPosition(convertedPosition);
+ return convertedPosition;
}
Dali::Window Window::Get(Dali::Actor actor)
}
Dali::Window Window::Get(Dali::Actor actor)