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
New size negotiation
[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
4374bfa
..
1f2ecc7
100644
(file)
--- a/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
+++ b/
automated-tests/src/dali-toolkit/utc-Dali-Popup.cpp
@@
-279,7
+279,6
@@
int UtcDaliPopupSetState(void)
// Create the Popup actor
Popup popup = Popup::New();
// Create the Popup actor
Popup popup = Popup::New();
- Stage::GetCurrent().Add( popup );
ImageActor backgroundImage = CreateSolidColorActor( Color::RED );
popup.SetBackgroundImage(backgroundImage);
ImageActor backgroundImage = CreateSolidColorActor( Color::RED );
popup.SetBackgroundImage(backgroundImage);
@@
-303,7
+302,6
@@
int UtcDaliPopupSetStateSlow(void)
// Create the Popup actor
Popup popup = Popup::New();
// Create the Popup actor
Popup popup = Popup::New();
- Stage::GetCurrent().Add( popup );
ImageActor backgroundImage = CreateSolidColorActor( Color::RED );
popup.SetBackgroundImage(backgroundImage);
ImageActor backgroundImage = CreateSolidColorActor( Color::RED );
popup.SetBackgroundImage(backgroundImage);
@@
-337,7
+335,6
@@
int UtcDaliPopupShowHide(void)
// Create the Popup actor
Popup popup = Popup::New();
// Create the Popup actor
Popup popup = Popup::New();
- Stage::GetCurrent().Add( popup );
popup.HiddenSignal().Connect( &OnPopupHidden );
ImageActor backgroundImage = CreateSolidColorActor( Color::RED );
popup.HiddenSignal().Connect( &OnPopupHidden );
ImageActor backgroundImage = CreateSolidColorActor( Color::RED );
@@
-345,9
+342,9
@@
int UtcDaliPopupShowHide(void)
PushButton button1 = PushButton::New();
PushButton button2 = PushButton::New();
PushButton button1 = PushButton::New();
PushButton button2 = PushButton::New();
- button1.Set
Size(DEFAULT_BUTTON_SIZE
);
+ button1.Set
PreferredSize(DEFAULT_BUTTON_SIZE.GetVectorXY()
);
popup.AddButton(button1);
popup.AddButton(button1);
- button2.Set
Size(DEFAULT_BUTTON_SIZE
);
+ button2.Set
PreferredSize(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