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 remote-tracking branch 'origin/tizen' into new_text
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit
/
utc-Dali-Popup.cpp
diff --git
a/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
b/automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
index
580e2c6
..
2148042
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@
-286,9
+286,9
@@
int UtcDaliPopupShowHide(void)
PushButton button1 = PushButton::New();
PushButton button2 = PushButton::New();
PushButton button1 = PushButton::New();
PushButton button2 = PushButton::New();
- button1.Set
Preferred
Size(DEFAULT_BUTTON_SIZE.GetVectorXY());
+ button1.SetSize(DEFAULT_BUTTON_SIZE.GetVectorXY());
popup.AddButton(button1);
popup.AddButton(button1);
- button2.Set
Preferred
Size(DEFAULT_BUTTON_SIZE.GetVectorXY());
+ button2.SetSize(DEFAULT_BUTTON_SIZE.GetVectorXY());
popup.AddButton(button2);
// Showing/Hiding popup, results in all child Actors being
popup.AddButton(button2);
// Showing/Hiding popup, results in all child Actors being