X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fimage-view%2Fimage-view-impl.h;h=a5a114f2e6115c922d113150323de3fe6f6b7a1e;hb=356b95b17862f70c298519387dc1091e40fb16da;hp=8b44b5f1d2e0258d00531f2866482aeeb6fba2bb;hpb=b016ed94d799d4c3840177157f0d4241d4448d14;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/controls/image-view/image-view-impl.h b/dali-toolkit/internal/controls/image-view/image-view-impl.h index 8b44b5f..a5a114f 100644 --- a/dali-toolkit/internal/controls/image-view/image-view-impl.h +++ b/dali-toolkit/internal/controls/image-view/image-view-impl.h @@ -1,8 +1,8 @@ -#ifndef __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__ -#define __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__ +#ifndef DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H +#define DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H /* - * Copyright (c) 2017 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. @@ -90,7 +90,7 @@ public: /** * @brief Query whether alpha is pre-multiplied. * - * @return True is alpha is pre-multiplied, false otherwise. + * @return True if alpha is pre-multiplied, false otherwise. */ bool IsPreMultipliedAlphaEnabled() const; @@ -173,6 +173,8 @@ private: Property::Map mPropertyMap; ///< the Property::Map if the image came from a Property::Map, empty otherwise Property::Map mShaderMap; ///< the Property::Map if the custom shader is set, empty otherwise ImageDimensions mImageSize; ///< the image size + + bool mImageVisualPaddingSetByTransform :1; //< Flag to indicate Padding was set using a transform. }; } // namespace Internal @@ -196,4 +198,4 @@ inline const Toolkit::Internal::ImageView& GetImpl( const Toolkit::ImageView& ob } // namespace Dali -#endif // __DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H__ +#endif // DALI_TOOLKIT_INTERNAL_IMAGE_VIEW_H