X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=58d2d92d83b80638ff13988c93e63a90b56abf8d;hp=7cc7571b8ce223f483183bd3b540c23f20eb127c;hb=670cb07df58286ca6f155c1b8e1455af948aac84;hpb=7862c06931f3feb015f06a011c875014e4cd2b37 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 7cc7571..58d2d92 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,23 @@ #include #include #include +#include +#include #include -#include -#include +#include #include #include // INTERNAL INCLUDES #include #include +#include +#include #include -#include +#include #include -#include #include -#include +#include namespace Dali { @@ -51,6 +53,37 @@ namespace { /** + * Struct used to store Visual within the control, index is a unique key for each visual. + */ +struct RegisteredVisual +{ + Property::Index index; + Toolkit::Visual::Base visual; + Actor placementActor; + bool enabled; + + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor, bool aEnabled) : + index(aIndex), visual(aVisual), placementActor(aPlacementActor), enabled(aEnabled) {} +}; + +typedef Dali::OwnerContainer< RegisteredVisual* > RegisteredVisualContainer; + +/** + * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter + */ +bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter ) +{ + for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + { + if ( (*iter)->index == targetIndex ) + { + return true; + } + } + return false; +} + +/** * Creates control through type registry */ BaseHandle Create() @@ -163,8 +196,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 +209,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 +364,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 +381,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; @@ -368,8 +399,10 @@ public: // Data Control& mControlImpl; + RegisteredVisualContainer mVisuals; // Stores visuals needed by the control, non trivial type so std::vector used. 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 +414,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 +436,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 ); @@ -444,53 +476,50 @@ 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; + mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + 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 + mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + if( mImpl->mBackgroundVisual ) { - mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); - mImpl->mBackgroundRenderer.SetOnStage( self ); + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); } } 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 ); + mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( image ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + 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) @@ -632,6 +661,136 @@ void Control::KeyboardEnter() OnKeyboardEnter(); } +void Control::RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual ) +{ + RegisterVisual( index, placementActor, visual, true ); +} + +void Control::RegisterVisual( Property::Index index, Actor& placementActor, Toolkit::Visual::Base& visual, bool enabled ) +{ + bool visualReplaced ( false ); + Actor actorToRegister; // Null actor, replaced if placement actor not Self + Actor self = Self(); + + if ( placementActor != self ) // Prevent increasing ref count if actor self + { + actorToRegister = placementActor; + } + + if ( !mImpl->mVisuals.Empty() ) + { + RegisteredVisualContainer::Iterator iter; + // Check if visual (index) is already registered. Replace if so. + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + if( (*iter)->visual && self.OnStage() ) + { + if( (*iter)->placementActor ) + { + (*iter)->visual.SetOffStage( (*iter)->placementActor ); + } + else + { + (*iter)->visual.SetOffStage( self ); + } + } + (*iter)->visual = visual; + (*iter)->placementActor = actorToRegister; + visualReplaced = true; + } + } + + if ( !visualReplaced ) // New registration entry + { + mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, actorToRegister, enabled ) ); + } + + if( visual && self.OnStage() && enabled ) + { + visual.SetOnStage( placementActor ); + } +} + +void Control::UnregisterVisual( Property::Index index ) +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + mImpl->mVisuals.Erase( iter ); + } +} + +Toolkit::Visual::Base Control::GetVisual( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + return (*iter)->visual; + } + + return Toolkit::Visual::Base(); +} + +void Control::EnableVisual( Property::Index index, bool enable ) +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + if ( (*iter)->enabled == enable ) + { + return; + } + + (*iter)->enabled = enable; + Actor parentActor = Self(); + if ( (*iter)->placementActor ) + { + parentActor = (*iter)->placementActor; + } + + if ( Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. + { + if ( enable ) + { + + (*iter)->visual.SetOnStage( parentActor ); + } + else + { + (*iter)->visual.SetOffStage( parentActor ); // No need to call if control not staged. + } + } + } +} + +bool Control::IsVisualEnabled( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + return (*iter)->enabled; + } + return false; +} + +Actor Control::GetPlacementActor( Property::Index index ) const +{ + RegisteredVisualContainer::Iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + if( (*iter)->placementActor ) + { + return (*iter)->placementActor; + } + else + { + return Self(); + } + } + + return Actor(); +} + bool Control::OnAccessibilityActivated() { return false; // Accessibility activation is not handled by default @@ -676,12 +835,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; } @@ -720,17 +879,21 @@ 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 +922,7 @@ void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Ty { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } + RelayoutRequest(); } void Control::OnPinch(const PinchGesture& pinch) @@ -813,19 +977,41 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { - if( mImpl->mBackgroundRenderer) + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - Actor self( Self() ); - mImpl->mBackgroundRenderer.SetOnStage( self ); + // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + if( (*iter)->visual && (*iter)->enabled ) + { + if( (*iter)->placementActor ) + { + (*iter)->visual.SetOnStage( (*iter)->placementActor ); + } + else + { + Actor self( Self() ); + (*iter)->visual.SetOnStage( self ); + } + } } } void Control::OnStageDisconnection() { - if( mImpl->mBackgroundRenderer ) + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - Actor self( Self() ); - mImpl->mBackgroundRenderer.SetOffStage( self ); + // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + if( (*iter)->visual ) + { + if( (*iter)->placementActor ) + { + (*iter)->visual.SetOffStage( (*iter)->placementActor ); + } + else + { + Actor self( Self() ); + (*iter)->visual.SetOffStage( self ); + } + } } } @@ -841,31 +1027,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 +1085,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;