X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fvisuals%2Fvisual-base-data-impl.cpp;h=67d54d5dd6298a0c592d286d5e79b6976ca51fa1;hb=3ad20543558830da2b46ec83e3be4f8daf77add0;hp=27ba4a05ea0657829e09ce01dcecb8548adf6b2b;hpb=ca4209fb071e5c353a7e528098a2e497765118d8;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp index 27ba4a0..67d54d5 100644 --- a/dali-toolkit/internal/visuals/visual-base-data-impl.cpp +++ b/dali-toolkit/internal/visuals/visual-base-data-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2017 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. @@ -19,7 +19,7 @@ #include // EXTERNAL INCLUDES -#include +#include #include #include #include @@ -114,18 +114,20 @@ bool GetPolicyFromValue( const Property::Value& value, Vector2& policy ) } // unnamed namespace -Internal::Visual::Base::Impl::Impl() +Internal::Visual::Base::Impl::Impl(FittingMode fittingMode) : mCustomShader( NULL ), mBlendSlotDelegate( NULL ), - mResourceObserver( NULL ), + mEventObserver( NULL ), mTransform(), mMixColor( Color::WHITE ), mControlSize( Vector2::ZERO ), + mCornerRadius( 0.0f ), mDepthIndex( 0.0f ), mMixColorIndex( Property::INVALID_INDEX ), - mOpacityIndex( Property::INVALID_INDEX ), + mCornerRadiusIndex( Property::INVALID_INDEX ), + mFittingMode( fittingMode ), mFlags( 0 ), - mResourceReady( false ) + mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING ) { }