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
[dali_1.9.17] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ControlWrapper.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
index
0921d61
..
e575bca
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ControlWrapper.cpp
@@
-385,7
+385,7
@@
int UtcDaliControlWrapperCalculateChildSizeBase(void)
Actor child = Actor::New();
child.SetResizePolicy( Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS );
Actor child = Actor::New();
child.SetResizePolicy( Dali::ResizePolicy::FIXED, Dali::Dimension::ALL_DIMENSIONS );
- child.Set
Size(150, 150
);
+ child.Set
Property( Actor::Property::SIZE, Vector2(150, 150)
);
application.SendNotification();
application.Render();
application.SendNotification();
application.Render();
@@
-527,7
+527,7
@@
int UtcDaliControlWrapperRegisterDisabledVisual(void)
DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
- DALI_TEST_EQUALS( controlWrapper.
OnStage(
), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( controlWrapper.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
), true, TEST_LOCATION );
controlWrapperImpl->EnableVisual( TEST_PROPERTY, true );
controlWrapperImpl->EnableVisual( TEST_PROPERTY, true );
@@
-570,7
+570,7
@@
int UtcDaliControlWrapperRegisterDisabledVisualWithDepthIndex(void)
DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
DALI_TEST_EQUALS( controlWrapperImpl->IsVisualEnabled( TEST_PROPERTY ), false, TEST_LOCATION );
- DALI_TEST_EQUALS( controlWrapper.
OnStage(
), true, TEST_LOCATION );
+ DALI_TEST_EQUALS( controlWrapper.
GetProperty< bool >( Actor::Property::CONNECTED_TO_SCENE
), true, TEST_LOCATION );
controlWrapperImpl->EnableVisual( TEST_PROPERTY, true );
controlWrapperImpl->EnableVisual( TEST_PROPERTY, true );
@@
-633,8
+633,8
@@
int UtcDaliControlWrapperTransitionDataMap1N(void)
//DummyControl actor = DummyControl::New();
controlWrapper.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
//DummyControl actor = DummyControl::New();
controlWrapper.SetResizePolicy(ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS);
- controlWrapper.Set
Name(
"Actor1");
- controlWrapper.Set
Color(
Color::CYAN);
+ controlWrapper.Set
Property( Dali::Actor::Property::NAME,
"Actor1");
+ controlWrapper.Set
Property( Actor::Property::COLOR,
Color::CYAN);
Stage::GetCurrent().Add(controlWrapper);
Animation anim = controlWrapperImpl->CreateTransition( transition );
Stage::GetCurrent().Add(controlWrapper);
Animation anim = controlWrapperImpl->CreateTransition( transition );
@@
-775,7
+775,7
@@
int UtcDaliControlWrapperAnimateVisual(void)
controlWrapperImpl->TestRegisterVisual( index, visual );
Stage::GetCurrent().Add( controlWrapper );
controlWrapperImpl->TestRegisterVisual( index, visual );
Stage::GetCurrent().Add( controlWrapper );
- controlWrapper.Set
Size( 100, 100
);
+ controlWrapper.Set
Property( Actor::Property::SIZE, Vector2( 100, 100 )
);
application.SendNotification();
application.Render(0); // Trigger animation start
application.SendNotification();
application.Render(0); // Trigger animation start
@@
-838,4
+838,4
@@
int UtcDaliControlWrapperEmitKeyFocusSignal(void)
DALI_TEST_CHECK( gKeyInputFocusCallBackCalled );
END_TEST;
DALI_TEST_CHECK( gKeyInputFocusCallBackCalled );
END_TEST;
-}
\ No newline at end of file
+}