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 "(Automated Tests) Changes after Window changes in Adaptor" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-ImageAtlas.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
index
0422166
..
90af333
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-ImageAtlas.cpp
@@
-412,8
+412,8
@@
int UtcDaliImageAtlasImageView(void)
imageView2.SetProperty( ImageView::Property::IMAGE, imageMap2 );
// ImageView doesn't do size negotiation properly: it only listens to OnSizeSet:
imageView2.SetProperty( ImageView::Property::IMAGE, imageMap2 );
// ImageView doesn't do size negotiation properly: it only listens to OnSizeSet:
- imageView1.Set
Size( 100, 100
);
- imageView2.Set
Size( 100, 100
);
+ imageView1.Set
Property( Actor::Property::SIZE, Vector2( 100, 100 )
);
+ imageView2.Set
Property( Actor::Property::SIZE, Vector2( 100, 100 )
);
imageView1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView1.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );
imageView2.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS );