X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=23745bbf5286c89d5f1db9eb72e0d0588678a61a;hb=refs%2Fchanges%2F70%2F83570%2F4;hp=df7bb8cc04c6677e92998c00f836aac9e2ecb6a0;hpb=a5fd3c7972dade609f0a66a3c4fca27d33ee7454;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 df7bb8c..23745bb 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,22 @@ #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 +52,33 @@ 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; + + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor) : index(aIndex), visual(aVisual), placementActor(aPlacementActor) {} +}; + +/** + * 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, std::vector& visuals, std::vector::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,9 +191,6 @@ TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &Do DALI_TYPE_REGISTRATION_END() -const char * const BACKGROUND_COLOR_NAME("color"); -const char * const COLOR_RENDERER_COLOR_NAME("blendColor"); - } // unnamed namespace namespace Internal @@ -179,7 +204,8 @@ public: Impl(Control& controlImpl) : mControlImpl( controlImpl ), mStyleName(""), - mBackgroundRenderer(), + mBackgroundVisual(), + mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), mKeyEventSignal(), mPinchGestureDetector(), @@ -188,8 +214,7 @@ public: mLongPressGestureDetector(), mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mAddRemoveBackgroundChild( false ) + mIsKeyboardFocusGroup( false ) { } @@ -283,21 +308,16 @@ public: case Toolkit::Control::Property::BACKGROUND: { - Image image = Scripting::NewImage( value ); - if ( image ) - { - controlImpl.SetBackgroundImage( image ); - break; - } const Property::Map* map = value.GetMap(); if( map ) { controlImpl.SetBackground( *map ); - break; } - - // The background is neither a valid image nor a property map, so it is no longer required - controlImpl.ClearBackground(); + else + { + // The background is not a property map, so we should clear the background + controlImpl.ClearBackground(); + } break; } } @@ -339,9 +359,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; @@ -356,9 +376,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; @@ -374,8 +394,10 @@ public: // Data Control& mControlImpl; + std::vector 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; @@ -390,7 +412,6 @@ public: 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; @@ -450,61 +471,47 @@ 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 ) { - const Property::Value* colorValue = map.Find( BACKGROUND_COLOR_NAME ); - Vector4 color; - if( colorValue && colorValue->Get(color)) - { - SetBackgroundColor( color ); - return; - } - 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 + InitializeVisual( self, mImpl->mBackgroundVisual, map ); + 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 ); + 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) @@ -646,6 +653,73 @@ void Control::KeyboardEnter() OnKeyboardEnter(); } +void Control::RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual ) +{ + bool visualReplaced ( false ); + Actor actorToRegister; // Null actor, replaced if placement actor not Self + + if ( placementActor != Self() ) // Prevent increasing ref count if actor self + { + actorToRegister = placementActor; + } + + if ( !mImpl->mVisuals.empty() ) + { + std::vector::iterator iter; + // Check if visual (index) is already registered. Replace if so. + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + (*iter).visual = visual; + (*iter).placementActor = actorToRegister; + visualReplaced = true; + } + } + + if ( !visualReplaced ) // New registration entry + { + RegisteredVisual newVisual = RegisteredVisual( index, visual, actorToRegister ); + mImpl->mVisuals.push_back( newVisual ); + } +} + +void Control::UnregisterVisual( Property::Index index ) +{ + std::vector< RegisteredVisual >::iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + mImpl->mVisuals.erase( iter ); + } +} + +Toolkit::Visual::Base Control::GetVisual( Property::Index index ) +{ + std::vector< RegisteredVisual >::iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + return (*iter).visual; + } + + return Toolkit::Visual::Base(); +} + +Actor Control::GetPlacementActor( Property::Index index ) +{ + std::vector< RegisteredVisual >::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 @@ -690,12 +764,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; } @@ -736,15 +810,18 @@ void Control::Initialize() if( mImpl->mFlags & REQUIRES_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() ) ); } } @@ -773,6 +850,7 @@ void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Ty { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } + RelayoutRequest(); } void Control::OnPinch(const PinchGesture& pinch) @@ -827,19 +905,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 ); } } @@ -855,31 +933,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) @@ -921,10 +991,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;