/*
- * 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.
#include <dali-toolkit/internal/visuals/visual-base-data-impl.h>
// EXTERNAL INCLUDES
-#include <dali/public-api/common/dali-common.h>
+#include <dali-toolkit/public-api/dali-toolkit-common.h>
#include <dali/devel-api/scripting/enum-helper.h>
#include <dali/devel-api/scripting/scripting.h>
#include <dali/integration-api/debug.h>
} // 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 ),
mResourceStatus( Toolkit::Visual::ResourceStatus::PREPARING )
{