X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Futc-Dali-FlexNode.cpp;h=307c14984d989498f328238022d3a2ee79655d88;hp=0c1ff77a27fcda0852ad03eb84531b6b9435a180;hb=8bb92d7d1170f2ddf59da60bd3588be601ef8cd2;hpb=e7dcd994ba541f20581b4c999043d4cbeb36416c diff --git a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp old mode 100755 new mode 100644 index 0c1ff77..307c149 --- a/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-FlexNode.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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. @@ -41,15 +41,14 @@ namespace const Flex::SizeTuple ITEM_SIZE = Flex::SizeTuple{ 10.0f, 10.0f }; const Flex::SizeTuple ITEM_SIZE_CALLBACK_TEST = Flex::SizeTuple{ 15.0f, 15.0f }; -Flex::SizeTuple MeasureChild( Actor child, float width, int measureModeWidth, float height, int measureModeHeight) +void MeasureChild( Actor child, float width, int measureModeWidth, float height, int measureModeHeight, Flex::SizeTuple *childSize) { - Flex::SizeTuple childSize = ITEM_SIZE; + *childSize = ITEM_SIZE; if (child.GetProperty< std::string >( Dali::Actor::Property::NAME ) == "callbackTest") { - childSize = ITEM_SIZE_CALLBACK_TEST; + *childSize = ITEM_SIZE_CALLBACK_TEST; } - tet_printf(" MeasureChild test callback executed (%f,%f)\n", childSize.width, childSize.height ); - return childSize; + tet_printf(" MeasureChild test callback executed (%f,%f)\n", childSize->width, childSize->height ); } }