X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.h;h=1f59ec05f1fb774607c45a0f503959240ee8e0f4;hp=c31037f99480743eaae49590f3a7f21a8a638abf;hb=27de3fbcd7105d89cbe3854bcf908f80176b31f0;hpb=d375dceca213569317d81d17cd2d2a4b45122cda diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.h b/dali-toolkit/internal/visuals/visual-base-data-impl.h index c31037f..1f59ec0 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.h +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_INTERNAL_VISUAL_BASE_DATA_IMPL_H /* - * Copyright (c) 2016 Samsung Electronics Co., Ltd. + * Copyright (c) 2018 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. @@ -25,7 +25,9 @@ // INTERNAL INCLUDES #include #include -#include +#include +#include +#include namespace Dali { @@ -43,8 +45,9 @@ struct Base::Impl { /** * Constructor + * @param [in] fittingMode that the derived class prefers */ - Impl(); + Impl(FittingMode fittingMode); /** * Destructor @@ -121,11 +124,11 @@ struct Base::Impl Transform mTransform; Vector4 mMixColor; Size mControlSize; - float mDepthIndex; + int mDepthIndex; Property::Index mMixColorIndex; - Property::Index mOpacityIndex; + FittingMode mFittingMode; //< How the contents should fit the view int mFlags; - bool mResourceReady:1; + Toolkit::Visual::ResourceStatus mResourceStatus; }; } // namespace Visual