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 "DALi C# Tizen GBS build: - currently GBS full auto building is impossible...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-KeyInputFocusManager.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
index
24b2fff
..
395b409
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-KeyInputFocusManager.cpp
@@
-20,6
+20,7
@@
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/integration-api/events/key-event-integ.h>
#include <dali-toolkit-test-suite-utils.h>
#include <dali-toolkit/dali-toolkit.h>
#include <dali/integration-api/events/key-event-integ.h>
+#include <dali-toolkit/devel-api/focus-manager/keyinput-focus-manager.h>
#include "dummy-control.h"
#include "dummy-control.h"
@@
-544,14
+545,14
@@
int UtcDaliKeyInputFocusManagerDestroyObject02(void)
{
BufferImage image = CreateBufferImage();
{
BufferImage image = CreateBufferImage();
-
ImageActor imageActor = ImageActor::New
( image );
- stage.Add(
imageA
ctor );
-
imageA
ctor.SetSize(100, 100);
+
Actor actor = CreateRenderableActor
( image );
+ stage.Add(
a
ctor );
+
a
ctor.SetSize(100, 100);
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
- stage.Remove(
imageA
ctor );
+ stage.Remove(
a
ctor );
}
DALI_TEST_CHECK( dummy2 == manager.GetCurrentFocusControl());
}
DALI_TEST_CHECK( dummy2 == manager.GetCurrentFocusControl());