X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=automated-tests%2Fsrc%2Fdali-toolkit%2Fcustom-layout-impl.h;h=375b4917176e632c3892b18fcffa8768f96edc83;hb=f7afcaf3b5cd7cd9aa3c937b680a525ecbbc8332;hp=06c67e0ab46c5fbf76a88a644e9ff64b35ec21c9;hpb=7098ad0a9a657b68b37d5fd759662a2d08b47433;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/automated-tests/src/dali-toolkit/custom-layout-impl.h b/automated-tests/src/dali-toolkit/custom-layout-impl.h index 06c67e0..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. @@ -109,6 +109,8 @@ private: */ 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: int mBehaviourFlags; // flags to alter behaviour of this custom layout