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 "Removed Visual::Base::SetProperty and GetProperty" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Slider.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
index
4f1e000
..
9cd92ca
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Slider.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
4
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
6
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.
@@
-333,7
+333,7
@@
int UtcDaliSetPropertyP(void)
{
Property::Map map;
{
Property::Map map;
- map["
renderer
Type"] = "IMAGE";
+ map["
visual
Type"] = "IMAGE";
map["size"] = Vector2(200, 200);
map["url"] = "track2.png";
slider.SetProperty(Slider::Property::TRACK_VISUAL, map);
map["size"] = Vector2(200, 200);
map["url"] = "track2.png";
slider.SetProperty(Slider::Property::TRACK_VISUAL, map);