projects
/
platform
/
core
/
uifw
/
dali-core.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
fcbf4db
)
Revert "[Tizen] Fix TC code conflict"
author
Joogab Yun
<joogab.yun@samsung.com>
Tue, 10 Sep 2019 08:58:35 +0000
(17:58 +0900)
committer
Joogab Yun
<joogab.yun@samsung.com>
Tue, 10 Sep 2019 08:58:35 +0000
(17:58 +0900)
This reverts commit
cbc07b5790faa3bd06c30a70d3517aa904642660
.
automated-tests/src/dali/utc-Dali-Scene.cpp
patch
|
blob
|
history
diff --git
a/automated-tests/src/dali/utc-Dali-Scene.cpp
b/automated-tests/src/dali/utc-Dali-Scene.cpp
index 11d55a61c7a5ed36c376d1aace0d4d7abee794e8..e3933668d24342a818bfa283d487edf50e43b3b1 100644
(file)
--- a/
automated-tests/src/dali/utc-Dali-Scene.cpp
+++ b/
automated-tests/src/dali/utc-Dali-Scene.cpp
@@
-1130,8
+1130,11
@@
int UtcDaliSceneSurfaceResizedAdditionalScene(void)
Vector2 originalSurfaceSize( 500.0f, 1000.0f );
TestRenderSurface surface( PositionSize( 0.0f, 0.0f, originalSurfaceSize.width, originalSurfaceSize.height ) );
-
+<<<<<<< HEAD
auto scene = Integration::Scene::New( surface );
+=======
+ scene.SetSurface( surface, false );
+>>>>>>> e6df4fb... Support Client and Screen Rotation
// Ensure stage size does NOT match the surface size
auto stage = Stage::GetCurrent();