X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fsuper-blur-view%2Fsuper-blur-view-impl.cpp;h=5544761f299b18a60220db3b7eb5db3be6dac38b;hp=17f2b55857046bed5e421263ed28231744539b10;hb=826a077bb3183b5d317bfb22e14ab4e217d26f40;hpb=7b09f888bc98f59e15a1d5fc8b56a36e779ad517 diff --git a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp index 17f2b55..5544761 100644 --- a/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp +++ b/dali-toolkit/internal/controls/super-blur-view/super-blur-view-impl.cpp @@ -1,27 +1,34 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// - -//EXTERNAL INCLUDES -#include -#include +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // CLASS HEADER #include "super-blur-view-impl.h" -namespace //unnamed namespace +// EXTERNAL INCLUDES +#include +#include +#include +#include +#include +#include +#include +#include + +namespace //Unnamed namespace { using namespace Dali; @@ -75,13 +82,12 @@ namespace Dali namespace Toolkit { -const Property::Index SuperBlurView::PROPERTY_IMAGE( Internal::SuperBlurView::SUPER_BLUR_VIEW_PROPERTY_START_INDEX ); - namespace Internal { namespace { + const unsigned int DEFAULT_BLUR_LEVEL(5u); ///< The default blur level when creating SuperBlurView from the type registry BaseHandle Create() @@ -89,24 +95,26 @@ BaseHandle Create() return Toolkit::SuperBlurView::New( DEFAULT_BLUR_LEVEL ); } -// Type registration -TypeRegistration typeRegistration( typeid(Toolkit::SuperBlurView), typeid(Toolkit::Control), Create ); +// Setup properties, signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::SuperBlurView, Toolkit::Control, Create ) + +DALI_PROPERTY_REGISTRATION( SuperBlurView, "image", MAP, IMAGE ) -PropertyRegistration property1( typeRegistration, "image", Toolkit::SuperBlurView::PROPERTY_IMAGE, Property::MAP, &SuperBlurView::SetProperty, &SuperBlurView::GetProperty ); +DALI_TYPE_REGISTRATION_END() } // unnamed namespace SuperBlurView::SuperBlurView( unsigned int blurLevels ) -: ControlImpl( false ), +: Control( CONTROL_BEHAVIOUR_NONE ), mBlurLevels( blurLevels ), mBlurStrengthPropertyIndex(Property::INVALID_INDEX), mResourcesCleared( true ), mTargetSize( Vector2::ZERO ) { DALI_ASSERT_ALWAYS( mBlurLevels > 0 && " Minimal blur level is one, otherwise no blur is needed" ); - mGaussianBlurView.resize( blurLevels ); - mBlurredImage.resize( blurLevels ); - mImageActors.resize( blurLevels + 1 ); + mGaussianBlurView.assign( blurLevels, NULL ); + mBlurredImage.assign( blurLevels, FrameBufferImage() ); + mImageActors.assign( blurLevels + 1, ImageActor() ); } SuperBlurView::~SuperBlurView() @@ -144,7 +152,7 @@ void SuperBlurView::OnInitialize() for(unsigned int i=0; i < mBlurLevels; i++) { - mImageActors[i].ApplyConstraint( Constraint::New( Actor::COLOR_ALPHA, ParentSource( mBlurStrengthPropertyIndex ), ActorOpacityConstraint(mBlurLevels, i) ) ); + mImageActors[i].ApplyConstraint( Constraint::New( Actor::Property::COLOR_ALPHA, ParentSource( mBlurStrengthPropertyIndex ), ActorOpacityConstraint(mBlurLevels, i) ) ); } Self().SetSize(Stage::GetCurrent().GetSize()); @@ -242,7 +250,7 @@ void SuperBlurView::ClearBlurResource() } } -void SuperBlurView::OnRelaidOut( Vector2 size, ActorSizeContainer& container ) +void SuperBlurView::OnRelayout( const Vector2& size, RelayoutContainer& container ) { unsigned int numChildren = Self().GetChildCount(); @@ -262,7 +270,7 @@ void SuperBlurView::OnControlSizeSet( const Vector3& targetSize ) { float exponent = static_cast(i+1); mBlurredImage[i] = FrameBufferImage::New( mTargetSize.width/std::pow(2.f,exponent) , mTargetSize.height/std::pow(2.f,exponent), - GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::Never ); + GAUSSIAN_BLUR_RENDER_TARGET_PIXEL_FORMAT, Dali::Image::NEVER ); } } } @@ -271,24 +279,20 @@ void SuperBlurView::SetProperty( BaseObject* object, Property::Index propertyInd { Toolkit::SuperBlurView superBlurView = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) ); - if ( superBlurView ) + if( superBlurView ) { SuperBlurView& superBlurViewImpl( GetImpl( superBlurView ) ); - switch ( propertyIndex ) + if( propertyIndex == Toolkit::SuperBlurView::Property::IMAGE ) { - case Toolkit::SuperBlurView::PROPERTY_IMAGE: + Dali::Image image = Scripting::NewImage( value ); + if ( image ) + { + superBlurViewImpl.SetImage( image ); + } + else { - Dali::Image image = Scripting::NewImage( value ); - if ( image ) - { - superBlurViewImpl.SetImage( image ); - } - else - { - DALI_LOG_ERROR( "Cannot create image from property value\n" ); - } - break; + DALI_LOG_ERROR( "Cannot create image from property value\n" ); } } } @@ -300,22 +304,18 @@ Property::Value SuperBlurView::GetProperty( BaseObject* object, Property::Index Toolkit::SuperBlurView pushButton = Toolkit::SuperBlurView::DownCast( Dali::BaseHandle( object ) ); - if ( pushButton ) + if( pushButton ) { SuperBlurView& superBlurViewImpl( GetImpl( pushButton ) ); - switch ( propertyIndex ) + if( propertyIndex == Toolkit::SuperBlurView::Property::IMAGE ) { - case Toolkit::SuperBlurView::PROPERTY_IMAGE: + Property::Map map; + if( !superBlurViewImpl.mImageActors.empty() && superBlurViewImpl.mImageActors[0] ) { - Property::Map map; - if ( !superBlurViewImpl.mImageActors.empty() && superBlurViewImpl.mImageActors[0] ) - { - Scripting::CreatePropertyMap( superBlurViewImpl.mImageActors[0], map ); - } - value = Property::Value( map ); - break; + Scripting::CreatePropertyMap( superBlurViewImpl.mImageActors[0], map ); } + value = Property::Value( map ); } }