X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fcustom-layout-impl.h;h=375b4917176e632c3892b18fcffa8768f96edc83;hp=7fb7be298d1c8c12ca6197b76a658c9054f20cb5;hb=267bed869a0b35414526b5c393fc2586603ee173;hpb=5434c2607f3806204be8d7f192d3be53584d9ad6 diff --git a/automated-tests/src/dali-toolkit/custom-layout-impl.h b/automated-tests/src/dali-toolkit/custom-layout-impl.h index 7fb7be2..375b491 100644 --- a/automated-tests/src/dali-toolkit/custom-layout-impl.h +++ b/automated-tests/src/dali-toolkit/custom-layout-impl.h @@ -2,7 +2,7 @@ #define TEST_INTERNAL_CUSTOM_LAYOUT_H /* - * Copyright (c) 2018 Samsung Electronics Co., Ltd. + * Copyright (c) 2019 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. @@ -107,7 +107,9 @@ private: * @param[out] resultingWidth resulting width of layout after children are measured * @param[out] resultingHeight resulting height of layout after children are measured */ - void MeasureChildren( Dali::Toolkit::Internal::LayoutItemPtr childLayout, MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec, int resultingWidth, int resultingHeight ); + void MeasureChildren( Dali::Toolkit::Internal::LayoutItemPtr childLayout, MeasureSpec widthMeasureSpec, MeasureSpec heightMeasureSpec, LayoutLength resultingWidth, LayoutLength resultingHeight ); + + using Dali::Toolkit::Internal::LayoutGroup::MeasureChildren; ///< To tell the compiler that we really do want to overload MeasureChildren in this class & were not trying to override it private: