X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=9bf179ff61ae2f58cc8cf74b3a18364fbb028709;hb=559cb1e4e4e511235de326b496510a93941ac9a2;hp=7cc7571b8ce223f483183bd3b540c23f20eb127c;hpb=7862c06931f3feb015f06a011c875014e4cd2b37;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 7cc7571..9bf179f 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2015 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 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,21 +25,25 @@ #include #include #include +#include +#include #include -#include -#include #include #include // INTERNAL INCLUDES #include #include +#include +#include #include -#include +#include #include -#include +#include #include -#include +#include +#include +#include namespace Dali { @@ -163,8 +167,6 @@ TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &Do DALI_TYPE_REGISTRATION_END() -const char * const COLOR_RENDERER_COLOR_NAME("blendColor"); - } // unnamed namespace namespace Internal @@ -178,17 +180,17 @@ public: Impl(Control& controlImpl) : mControlImpl( controlImpl ), mStyleName(""), - mBackgroundRenderer(), + mBackgroundVisual(), + mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), mKeyEventSignal(), mPinchGestureDetector(), mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), + mFlags( Control::ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mAddRemoveBackgroundChild( false ) + mIsKeyboardFocusGroup( false ) { } @@ -333,9 +335,9 @@ public: { DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); Property::Map map; - if( controlImpl.mImpl->mBackgroundRenderer ) + if( controlImpl.mImpl->mBackgroundVisual ) { - controlImpl.mImpl->mBackgroundRenderer.CreatePropertyMap( map ); + controlImpl.mImpl->mBackgroundVisual.CreatePropertyMap( map ); } value = map; break; @@ -350,9 +352,9 @@ public: case Toolkit::Control::Property::BACKGROUND: { Property::Map map; - if( controlImpl.mImpl->mBackgroundRenderer ) + if( controlImpl.mImpl->mBackgroundVisual ) { - (controlImpl.mImpl->mBackgroundRenderer).CreatePropertyMap( map ); + (controlImpl.mImpl->mBackgroundVisual).CreatePropertyMap( map ); } value = map; @@ -369,7 +371,8 @@ public: Control& mControlImpl; std::string mStyleName; - Toolkit::ControlRenderer mBackgroundRenderer; ///< The control renderer to render the background + Toolkit::Visual::Base mBackgroundVisual; ///< The visual to render the background + Vector4 mBackgroundColor; ///< The color of the background visual Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal; Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal; @@ -381,10 +384,9 @@ public: TapGestureDetector mTapGestureDetector; LongPressGestureDetector mLongPressGestureDetector; - ControlBehaviour mFlags :CONTROL_BEHAVIOUR_FLAG_COUNT; ///< Flags passed in from constructor. + ControlBehaviour mFlags : CONTROL_BEHAVIOUR_FLAG_COUNT; ///< Flags passed in from constructor. bool mIsKeyboardNavigationSupported :1; ///< Stores whether keyboard navigation is supported by the control. bool mIsKeyboardFocusGroup :1; ///< Stores whether the control is a focus group. - bool mAddRemoveBackgroundChild:1; ///< Flag to know when we are adding or removing our own actor to avoid call to OnControlChildAdd // Properties - these need to be members of Internal::Control::Impl as they need to function within this class. static const PropertyRegistration PROPERTY_1; @@ -404,7 +406,7 @@ const PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "backgro Toolkit::Control Control::New() { // Create the implementation, temporarily owned on stack - IntrusivePtr controlImpl = new Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ); + IntrusivePtr controlImpl = new Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ); // Pass ownership to handle Toolkit::Control handle( *controlImpl ); @@ -416,11 +418,6 @@ Toolkit::Control Control::New() return handle; } -Control::~Control() -{ - delete mImpl; -} - void Control::SetStyleName( const std::string& styleName ) { if( styleName != mImpl->mStyleName ) @@ -444,53 +441,65 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { Actor self( Self() ); - Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); - factory.ResetRenderer( mImpl->mBackgroundRenderer, self, color ); - mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); + mImpl->mBackgroundColor = color; + Property::Map map; + map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; + InitializeVisual( self, mImpl->mBackgroundVisual, map ); + if( mImpl->mBackgroundVisual ) + { + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); + } } Vector4 Control::GetBackgroundColor() const { - if( mImpl->mBackgroundRenderer && ( &typeid( GetImplementation(mImpl->mBackgroundRenderer) ) == &typeid( ColorRenderer ) ) ) - { - Property::Map map; - mImpl->mBackgroundRenderer.CreatePropertyMap( map ); - const Property::Value* colorValue = map.Find( COLOR_RENDERER_COLOR_NAME ); - Vector4 color; - if( colorValue && colorValue->Get(color)) - { - return color; - } - } - - return Color::TRANSPARENT; + return mImpl->mBackgroundColor; } -void Control::SetBackground(const Property::Map& map) +void Control::SetBackground( const Property::Map& map ) { Actor self( Self() ); - mImpl->mBackgroundRenderer.RemoveAndReset( self ); - Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); - mImpl->mBackgroundRenderer = factory.GetControlRenderer( map ); - if( mImpl->mBackgroundRenderer && self.OnStage() ) // Request control renderer with a property map might return an empty handle + Toolkit::Visual::Base backgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); + + // if new visual created, replace existing one + if( backgroundVisual ) { - mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); - mImpl->mBackgroundRenderer.SetOnStage( self ); + if( self.OnStage() ) + { + mImpl->mBackgroundVisual.RemoveAndReset( self ); + backgroundVisual.SetOnStage( self ); + } + mImpl->mBackgroundVisual = backgroundVisual; + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); + } + // ...otherwise process map and apply it to the existing visual + else if( mImpl->mBackgroundVisual ) + { + Property::Value* premultipliedAlpha = map.Find( Toolkit::DevelVisual::Property::PREMULTIPLIED_ALPHA, Toolkit::Internal::PREMULTIPLIED_ALPHA ); + if( premultipliedAlpha ) + { + bool value( premultipliedAlpha->Get() ); + Toolkit::GetImplementation( mImpl->mBackgroundVisual ).EnablePreMultipliedAlpha( value ); + } } } void Control::SetBackgroundImage( Image image ) { Actor self( Self() ); - Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); - factory.ResetRenderer( mImpl->mBackgroundRenderer, self, image ); - mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); + InitializeVisual( self, mImpl->mBackgroundVisual, image ); + if( mImpl->mBackgroundVisual ) + { + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); + } } void Control::ClearBackground() { Actor self( Self() ); - mImpl->mBackgroundRenderer.RemoveAndReset( self ); + mImpl->mBackgroundVisual.RemoveAndReset( self ); + mImpl->mBackgroundColor = Color::TRANSPARENT; } void Control::EnableGestureDetection(Gesture::Type type) @@ -676,12 +685,12 @@ Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() return mImpl->mKeyEventSignal; } -Toolkit::Control::KeyInputFocusSignalType& Control:: KeyInputFocusGainedSignal() +Toolkit::Control::KeyInputFocusSignalType& Control::KeyInputFocusGainedSignal() { return mImpl->mKeyInputFocusGainedSignal; } -Toolkit::Control::KeyInputFocusSignalType& Control:: KeyInputFocusLostSignal() +Toolkit::Control::KeyInputFocusSignalType& Control::KeyInputFocusLostSignal() { return mImpl->mKeyInputFocusLostSignal; } @@ -715,22 +724,31 @@ Control::Control( ControlBehaviour behaviourFlags ) mImpl->mFlags = behaviourFlags; } +Control::~Control() +{ + delete mImpl; +} + void Control::Initialize() { // Call deriving classes so initialised before styling is applied to them. OnInitialize(); - if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) + if( (mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS) || + !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) ) { - Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + Toolkit::StyleManager styleManager = StyleManager::Get(); + // if stylemanager is available if( styleManager ) { + StyleManager& styleManagerImpl = GetImpl( styleManager ); + // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); + styleManagerImpl.ControlStyleChangeSignal().Connect( this, &Control::OnStyleChange ); // Apply the current style - GetImpl( styleManager ).ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); } } @@ -759,6 +777,7 @@ void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Ty { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } + RelayoutRequest(); } void Control::OnPinch(const PinchGesture& pinch) @@ -813,19 +832,19 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { - if( mImpl->mBackgroundRenderer) + if( mImpl->mBackgroundVisual) { Actor self( Self() ); - mImpl->mBackgroundRenderer.SetOnStage( self ); + mImpl->mBackgroundVisual.SetOnStage( self ); } } void Control::OnStageDisconnection() { - if( mImpl->mBackgroundRenderer ) + if( mImpl->mBackgroundVisual ) { Actor self( Self() ); - mImpl->mBackgroundRenderer.SetOffStage( self ); + mImpl->mBackgroundVisual.SetOffStage( self ); } } @@ -841,31 +860,23 @@ void Control::OnKeyInputFocusLost() void Control::OnChildAdd(Actor& child) { - // If this is the background actor, then we do not want to inform deriving classes - if ( mImpl->mAddRemoveBackgroundChild ) - { - return; - } - // Notify derived classes. OnControlChildAdd( child ); } void Control::OnChildRemove(Actor& child) { - // If this is the background actor, then we do not want to inform deriving classes - if ( mImpl->mAddRemoveBackgroundChild ) - { - return; - } - // Notify derived classes. OnControlChildRemove( child ); } void Control::OnSizeSet(const Vector3& targetSize) { - // Background is resized through size negotiation + if( mImpl->mBackgroundVisual ) + { + Vector2 size( targetSize ); + mImpl->mBackgroundVisual.SetSize( size ); + } } void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize) @@ -907,10 +918,10 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime Vector3 Control::GetNaturalSize() { - if( mImpl->mBackgroundRenderer ) + if( mImpl->mBackgroundVisual ) { Vector2 naturalSize; - mImpl->mBackgroundRenderer.GetNaturalSize(naturalSize); + mImpl->mBackgroundVisual.GetNaturalSize(naturalSize); return Vector3(naturalSize); } return Vector3::ZERO;