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
Merge "add theme to TextSelectionPopup/Button/Toolbar according to 6.5 IoT UX" into...
[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
b466cfc
..
86b3bd9
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
@@
-33,43
+33,45
@@
public:
TestRenderSurface( PositionSize positionSize ) {};
TestRenderSurface( PositionSize positionSize ) {};
-
virtual PositionSize GetPositionSize() const
{ PositionSize size; return size; };
+
PositionSize GetPositionSize() const override
{ PositionSize size; return size; };
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
virtual void GetDpi( unsigned int& dpiHorizontal, unsigned int& dpiVertical ) { dpiHorizontal = dpiVertical = 96; }
- v
irtual void InitializeGraphics()
{};
+ v
oid InitializeGraphics() override
{};
- v
irtual void CreateSurface()
{};
+ v
oid CreateSurface() override
{};
- v
irtual void DestroySurface()
{};
+ v
oid DestroySurface() override
{};
-
virtual bool ReplaceGraphicsSurface()
{ return false; };
+
bool ReplaceGraphicsSurface() override
{ return false; };
- v
irtual void MoveResize( Dali::PositionSize positionSize )
{};
+ v
oid MoveResize( Dali::PositionSize positionSize ) override
{};
- v
irtual void StartRender()
{};
+ v
oid StartRender() override
{};
-
virtual bool PreRender( bool resizingSurface )
{ return false; };
+
bool PreRender( bool resizingSurface, const std::vector<Rect<int>>& damagedRects, Rect<int>& clippingRect ) override
{ return false; };
- v
irtual void PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface )
{};
+ v
oid PostRender( bool renderToFbo, bool replacingSurface, bool resizingSurface, const std::vector<Rect<int>>& damagedRects ) override
{};
- v
irtual void StopRender()
{};
+ v
oid StopRender() override
{};
- v
irtual void ReleaseLock()
{};
+ v
oid ReleaseLock() override
{};
- v
irtual void SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization )
{};
+ v
oid SetThreadSynchronization( ThreadSynchronizationInterface& threadSynchronization ) override
{};
-
virtual RenderSurfaceInterface::Type GetSurfaceType()
{ return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; };
+
RenderSurfaceInterface::Type GetSurfaceType() override
{ return RenderSurfaceInterface::WINDOW_RENDER_SURFACE; };
- v
irtual void MakeContextCurrent()
{};
+ v
oid MakeContextCurrent() override
{};
-
virtual Integration::DepthBufferAvailable GetDepthBufferRequired()
{ return Integration::DepthBufferAvailable::FALSE; };
+
Integration::DepthBufferAvailable GetDepthBufferRequired() override
{ return Integration::DepthBufferAvailable::FALSE; };
-
virtual Integration::StencilBufferAvailable GetStencilBufferRequired()
{ return Integration::StencilBufferAvailable::FALSE; };
+
Integration::StencilBufferAvailable GetStencilBufferRequired() override
{ return Integration::StencilBufferAvailable::FALSE; };
-
virtual void SetBackgroundColor( Vector4 color ) {
};
+
int GetOrientation() const override {return 0;
};
- virtual Vector4 GetBackgroundColor() { return Color::WHITE; };
+ void SetBackgroundColor( Vector4 color ) {};
+
+ Vector4 GetBackgroundColor() { return Color::WHITE; };
};
namespace Internal
};
namespace Internal
@@
-106,7
+108,7
@@
public:
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& KeyEventGeneratedSignal();
- Dali::Integration::SceneHolder::Touch
SignalType& Touch
Signal();
+ Dali::Integration::SceneHolder::Touch
EventSignalType& Touched
Signal();
Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();
Dali::Integration::SceneHolder::WheelEventSignalType& WheelEventSignal();