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
Add APIs of webview settings.
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
dali-toolkit-test-utils
/
toolkit-scene-holder.cpp
diff --git
a/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
b/automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
index
bfc1315
..
e18809a
100644
(file)
--- a/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
+++ b/
automated-tests/src/dali-toolkit/dali-toolkit-test-utils/toolkit-scene-holder.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 20
19
Samsung Electronics Co., Ltd.
+ * Copyright (c) 20
20
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.
@@
-16,16
+16,15
@@
*/
#include <dali/integration-api/events/touch-event-integ.h>
*/
#include <dali/integration-api/events/touch-event-integ.h>
-#include <dali/integration-api/adaptor
s
/scene-holder.h>
+#include <dali/integration-api/adaptor
-framework
/scene-holder.h>
#include <toolkit-scene-holder-impl.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
#include <toolkit-scene-holder-impl.h>
#include <dali/public-api/actors/actor.h>
#include <dali/public-api/actors/layer.h>
-#include <dali/public-api/common/stage.h>
#include <dali/public-api/object/base-object.h>
#include <dali/public-api/object/base-object.h>
-#include <dali/integration-api/adaptor
s
/adaptor.h>
+#include <dali/integration-api/adaptor
-framework
/adaptor.h>
#include <toolkit-adaptor-impl.h>
using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
#include <toolkit-adaptor-impl.h>
using AdaptorImpl = Dali::Internal::Adaptor::Adaptor;
@@
-47,7
+46,7
@@
namespace Adaptor
SceneHolder::SceneHolder( const Dali::Rect<int>& positionSize )
: mRenderSurface( positionSize ),
SceneHolder::SceneHolder( const Dali::Rect<int>& positionSize )
: mRenderSurface( positionSize ),
- mScene( Dali::Integration::Scene::New(
mRenderSurface
) )
+ mScene( Dali::Integration::Scene::New(
Dali::Size( static_cast<float>( positionSize.width ), static_cast<float>( positionSize.height ) )
) )
{
}
{
}
@@
-106,9
+105,9
@@
Dali::Integration::SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEve
return mScene.KeyEventGeneratedSignal();
}
return mScene.KeyEventGeneratedSignal();
}
-Dali::Integration::SceneHolder::Touch
SignalType& SceneHolder::Touch
Signal()
+Dali::Integration::SceneHolder::Touch
EventSignalType& SceneHolder::Touched
Signal()
{
{
- return mScene.TouchSignal();
+ return mScene.Touch
ed
Signal();
}
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
}
Dali::Integration::SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
@@
-121,7
+120,7
@@
Integration::Scene SceneHolder::GetScene()
return mScene;
}
return mScene;
}
-
Integration::RenderSu
rface& SceneHolder::GetRenderSurface()
+
Dali::RenderSurfaceInte
rface& SceneHolder::GetRenderSurface()
{
return mRenderSurface;
}
{
return mRenderSurface;
}
@@
-226,9
+225,9
@@
SceneHolder::KeyEventGeneratedSignalType& SceneHolder::KeyEventGeneratedSignal()
return GetImplementation( *this ).KeyEventGeneratedSignal();
}
return GetImplementation( *this ).KeyEventGeneratedSignal();
}
-SceneHolder::Touch
SignalType& SceneHolder::Touch
Signal()
+SceneHolder::Touch
EventSignalType& SceneHolder::Touched
Signal()
{
{
- return GetImplementation( *this ).TouchSignal();
+ return GetImplementation( *this ).Touch
ed
Signal();
}
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()
}
SceneHolder::WheelEventSignalType& SceneHolder::WheelEventSignal()