projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Use SceneHolder::Get() instead of Window::Get()
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder-impl.h
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
index
0cfdcc0
..
42050e4
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder-impl.h
@@
-31,9
+31,9
@@
class TestRenderSurface : public Dali::RenderSurfaceInterface
{
public:
{
public:
- TestRenderSurface( PositionSize positionSize ) {};
+ TestRenderSurface( PositionSize positionSize )
: mPositionSize(positionSize)
{};
- PositionSize GetPositionSize() const override {
PositionSize size; return s
ize; };
+ PositionSize GetPositionSize() const override {
return mPositionS
ize; };
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
@@
-45,7
+45,7
@@
public:
bool ReplaceGraphicsSurface() override { return false; };
bool ReplaceGraphicsSurface() override { return false; };
- void MoveResize( Dali::PositionSize positionSize ) override {};
+ void MoveResize( Dali::PositionSize positionSize ) override {
mPositionSize = positionSize;
};
void StartRender() override {};
void StartRender() override {};
@@
-71,11
+71,16
@@
public:
Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; };
Integration::StencilBufferAvailable GetStencilBufferRequired() override { return Integration::StencilBufferAvailable::FALSE; };
- int GetOrientation() const override {return 0;};
+ int GetSurfaceOrientation() const override {return 0;};
+
+ int GetScreenOrientation() const override {return 0;};
void SetBackgroundColor( Vector4 color ) {};
Vector4 GetBackgroundColor() { return Color::WHITE; };
void SetBackgroundColor( Vector4 color ) {};
Vector4 GetBackgroundColor() { return Color::WHITE; };
+
+private:
+ PositionSize mPositionSize;
};
namespace Internal
};
namespace Internal
@@
-116,11
+121,15
@@
public:
Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();
Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();
+ Dali::Integration::SceneHolder::WheelEventGeneratedSignalType& WheelEventGeneratedSignal();
+
Integration::Scene GetScene();
Dali::RenderSurfaceInterface& GetRenderSurface();
Integration::Scene GetScene();
Dali::RenderSurfaceInterface& GetRenderSurface();
-private:
+ Dali::RenderTaskList GetRenderTaskList();
+
+protected:
TestRenderSurface mRenderSurface;
Integration::Scene mScene;
TestRenderSurface mRenderSurface;
Integration::Scene mScene;