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=c0c71eae019eca60300b625f86523c9c87fc2f75;hb=670cb07df58286ca6f155c1b8e1455af948aac84;hpb=88e94c0533741de9664d32968a85f18db5a4c5dd diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index c0c71ea..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. @@ -22,23 +22,26 @@ #include // for strcmp #include #include -#include #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 { @@ -50,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() @@ -64,7 +98,7 @@ BaseHandle Create() * @param[in] attributes The attributes with which to perfrom this action. * @return true if action has been accepted by this control */ -const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibility-activated"; +const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibilityActivated"; static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) { bool ret = false; @@ -91,13 +125,13 @@ static bool DoAction( BaseObject* object, const std::string& actionName, const P * @return True if the signal was connected. * @post If a signal was connected, ownership of functor was passed to CallbackBase. Otherwise the caller is responsible for deleting the unused functor. */ -const char* SIGNAL_KEY_EVENT = "key-event"; -const char* SIGNAL_KEY_INPUT_FOCUS_GAINED = "key-input-focus-gained"; -const char* SIGNAL_KEY_INPUT_FOCUS_LOST = "key-input-focus-lost"; +const char* SIGNAL_KEY_EVENT = "keyEvent"; +const char* SIGNAL_KEY_INPUT_FOCUS_GAINED = "keyInputFocusGained"; +const char* SIGNAL_KEY_INPUT_FOCUS_LOST = "keyInputFocusLost"; const char* SIGNAL_TAPPED = "tapped"; const char* SIGNAL_PANNED = "panned"; const char* SIGNAL_PINCHED = "pinched"; -const char* SIGNAL_LONG_PRESSED = "long-pressed"; +const char* SIGNAL_LONG_PRESSED = "longPressed"; static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { Dali::BaseHandle handle( object ); @@ -162,129 +196,6 @@ TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &Do DALI_TYPE_REGISTRATION_END() -/** - * Structure which holds information about the background of a control - */ -struct Background -{ - Actor actor; ///< Background actor - Vector4 color; ///< The color of the actor. - - /** - * Constructor - */ - Background() - : actor(), - color( Color::WHITE ) - { - } -}; - -unsigned int gQuadIndex[6] = { 0, 2, 1, 1, 2, 3 }; - -Vector2 gQuad[] = { - Vector2( -0.5f, -0.5f ), - Vector2( 0.5f, -0.5f ), - Vector2( -0.5f, 0.5f ), - Vector2( 0.5f, 0.5f ) -}; - - -const char* VERTEX_SHADER_COLOR = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - uniform mediump mat4 uMvpMatrix;\n - void main()\n - {\n - gl_Position = uMvpMatrix * vec4( aPosition, 0.0, 1.0 );\n - }\n -); - -const char* FRAGMENT_SHADER_COLOR = DALI_COMPOSE_SHADER( - uniform lowp vec4 uBackgroundColor;\n - uniform lowp vec4 uColor;\n - void main()\n - {\n - gl_FragColor = uBackgroundColor * uColor;\n - }\n -); - - -/** - * @brief Create the background actor for the control. - * - * @param[in] actor The parent actor of the background - * @param[in] color The background color - * @param[in] image If a valid image is supplied this will be the texture used by the background - * - * @return An actor which will render the background - * - */ -Actor CreateBackground( Actor parent, const Vector4& color, Image image = Image() ) -{ - if( !image ) - { - PropertyBuffer vertexBuffer; - Shader shader; - Material material; - - Property::Map vertexFormat; - vertexFormat["aPosition"] = Property::VECTOR2; - - //Create a vertex buffer for vertex positions - vertexBuffer = PropertyBuffer::New( vertexFormat, 4u ); - vertexBuffer.SetData( gQuad ); - - shader = Shader::New( VERTEX_SHADER_COLOR, FRAGMENT_SHADER_COLOR ); - material = Material::New( shader ); - - //Create the index buffer - Property::Map indexFormat; - indexFormat["indices"] = Property::UNSIGNED_INTEGER; - PropertyBuffer indexBuffer = PropertyBuffer::New( indexFormat, 6u ); - indexBuffer.SetData(gQuadIndex); - - //Create the geometry - Geometry mesh = Geometry::New(); - mesh.AddVertexBuffer( vertexBuffer ); - mesh.SetIndexBuffer( indexBuffer ); - - //Add uniforms to the shader - shader.RegisterProperty( "uBackgroundColor", color ); - - //Create the renderer - Renderer renderer = Renderer::New( mesh, material ); - renderer.SetDepthIndex( parent.GetHierarchyDepth() + BACKGROUND_DEPTH_INDEX ); - - //Create the actor - Actor meshActor = Actor::New(); - meshActor.SetSize( Vector3::ONE ); - meshActor.AddRenderer( renderer ); - meshActor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); - meshActor.SetColorMode( USE_PARENT_COLOR ); - - //Constraint scale of the mesh actor to the size of the control - Constraint constraint = Constraint::New( meshActor, - Actor::Property::SCALE, - EqualToConstraint() ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); - - return meshActor; - } - else - { - ImageActor imageActor = ImageActor::New( image ); - imageActor.SetColor( color ); - imageActor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); - imageActor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); - imageActor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - imageActor.SetSortModifier( parent.GetHierarchyDepth() + BACKGROUND_DEPTH_INDEX ); - - return imageActor; - } - -} - } // unnamed namespace namespace Internal @@ -298,24 +209,23 @@ public: Impl(Control& controlImpl) : mControlImpl( controlImpl ), mStyleName(""), - mBackground( NULL ), + 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 ) { } ~Impl() { // All gesture detectors will be destroyed so no need to disconnect. - delete mBackground; delete mStartingPinchScale; } @@ -341,21 +251,6 @@ public: mControlImpl.OnLongPress(longPress); } - // Background Methods - - /** - * Only creates an instance of the background if we actually use it. - * @return A reference to the Background structure. - */ - Background& GetBackground() - { - if ( !mBackground ) - { - mBackground = new Background; - } - return *mBackground; - } - // Properties /** @@ -382,12 +277,14 @@ public: case Toolkit::Control::Property::BACKGROUND_COLOR: { + DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); controlImpl.SetBackgroundColor( value.Get< Vector4 >() ); break; } case Toolkit::Control::Property::BACKGROUND_IMAGE: { + DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); Image image = Scripting::NewImage( value ); if ( image ) { @@ -413,6 +310,21 @@ public: } break; } + + case Toolkit::Control::Property::BACKGROUND: + { + const Property::Map* map = value.GetMap(); + if( map ) + { + controlImpl.SetBackground( *map ); + } + else + { + // The background is not a property map, so we should clear the background + controlImpl.ClearBackground(); + } + break; + } } } } @@ -443,36 +355,19 @@ public: case Toolkit::Control::Property::BACKGROUND_COLOR: { + DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); value = controlImpl.GetBackgroundColor(); break; } case Toolkit::Control::Property::BACKGROUND_IMAGE: { + DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); Property::Map map; - - Background* back = controlImpl.mImpl->mBackground; - if ( back && back->actor ) + if( controlImpl.mImpl->mBackgroundVisual ) { - if( back->actor.GetRendererCount() > 0 && back->actor.GetRendererAt(0).GetMaterial().GetNumberOfSamplers() > 0 ) - { - Image image = back->actor.GetRendererAt(0).GetMaterial().GetSamplerAt(0).GetImage(); - if ( image ) - { - Scripting::CreatePropertyMap( image, map ); - } - } - else - { - ImageActor imageActor = ImageActor::DownCast( back->actor ); - if ( imageActor ) - { - Image image = imageActor.GetImage(); - Scripting::CreatePropertyMap( image, map ); - } - } + controlImpl.mImpl->mBackgroundVisual.CreatePropertyMap( map ); } - value = map; break; } @@ -482,6 +377,19 @@ public: value = controlImpl.HasKeyInputFocus(); break; } + + case Toolkit::Control::Property::BACKGROUND: + { + Property::Map map; + if( controlImpl.mImpl->mBackgroundVisual ) + { + (controlImpl.mImpl->mBackgroundVisual).CreatePropertyMap( map ); + } + + value = map; + break; + } + } } @@ -491,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; - Background* mBackground; ///< Only create the background if we use it + 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; @@ -504,28 +414,29 @@ 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 PropertyRegistration PROPERTY_1; - static PropertyRegistration PROPERTY_2; - static PropertyRegistration PROPERTY_3; - static PropertyRegistration PROPERTY_4; + static const PropertyRegistration PROPERTY_1; + static const PropertyRegistration PROPERTY_2; + static const PropertyRegistration PROPERTY_3; + static const PropertyRegistration PROPERTY_4; + static const PropertyRegistration PROPERTY_5; }; // Properties registered without macro to use specific member variables. -PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "style-name", Toolkit::Control::Property::STYLE_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "background-color", Toolkit::Control::Property::BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "background-image", Toolkit::Control::Property::BACKGROUND_IMAGE, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "key-input-focus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "styleName", Toolkit::Control::Property::STYLE_NAME, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "backgroundColor", Toolkit::Control::Property::BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "backgroundImage", Toolkit::Control::Property::BACKGROUND_IMAGE, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "keyInputFocus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +const PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); 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 ); @@ -564,78 +475,51 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) + Actor self( Self() ); + 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 ) { - if( background.actor.GetRendererCount() > 0 ) - { - Shader shader = background.actor.GetRendererAt(0).GetMaterial().GetShader(); - shader.SetProperty( shader.GetPropertyIndex("uBackgroundColor"), color ); - } - else - { - background.actor.SetColor( color ); - } + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); } - else - { - // Create Mesh Actor - Actor actor = CreateBackground(Self(), color ); - background.actor = actor; - mImpl->mAddRemoveBackgroundChild = true; - // use insert to guarantee its the first child (so that OVERLAY mode works) - Self().Insert( 0, actor ); - mImpl->mAddRemoveBackgroundChild = false; - } - - background.color = color; } Vector4 Control::GetBackgroundColor() const { - if ( mImpl->mBackground ) + return mImpl->mBackgroundColor; +} + +void Control::SetBackground( const Property::Map& map ) +{ + Actor self( Self() ); + mImpl->mBackgroundVisual = Toolkit::VisualFactory::Get().CreateVisual( map ); + RegisterVisual( Toolkit::Control::Property::BACKGROUND, self, mImpl->mBackgroundVisual ); + if( mImpl->mBackgroundVisual ) { - return mImpl->mBackground->color; + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); } - return Color::TRANSPARENT; } void Control::SetBackgroundImage( Image image ) { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) - { - // Remove Current actor, unset AFTER removal - mImpl->mAddRemoveBackgroundChild = true; - Self().Remove( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; - background.actor.Reset(); - } - - Actor actor = CreateBackground(Self(), background.color, image); - - // Set the background actor before adding so that we do not inform derived classes - background.actor = actor; - mImpl->mAddRemoveBackgroundChild = true; - // use insert to guarantee its the first child (so that OVERLAY mode works) - Self().Insert( 0, actor ); - mImpl->mAddRemoveBackgroundChild = false; + Actor self( Self() ); + 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() { - if ( mImpl->mBackground ) - { - Background& background( mImpl->GetBackground() ); - mImpl->mAddRemoveBackgroundChild = true; - Self().Remove( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; - - delete mImpl->mBackground; - mImpl->mBackground = NULL; - } + Actor self( Self() ); + mImpl->mBackgroundVisual.RemoveAndReset( self ); + mImpl->mBackgroundColor = Color::TRANSPARENT; } void Control::EnableGestureDetection(Gesture::Type type) @@ -777,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 @@ -821,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; } @@ -865,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 ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); } } @@ -900,10 +918,11 @@ void Control::OnControlChildRemove( Actor& child ) void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { // By default the control is only interested in theme (not font) changes - if( change == StyleChange::THEME_CHANGE ) + if( styleManager && change == StyleChange::THEME_CHANGE ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } + RelayoutRequest(); } void Control::OnPinch(const PinchGesture& pinch) @@ -958,42 +977,44 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { - unsigned int controlRendererCount = Self().GetRendererCount(); - for( unsigned int i(0); imVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - Renderer controlRenderer = Self().GetRendererAt(i); - if( controlRenderer ) + // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + if( (*iter)->visual && (*iter)->enabled ) { - controlRenderer.SetDepthIndex( CONTENT_DEPTH_INDEX+depth ); + if( (*iter)->placementActor ) + { + (*iter)->visual.SetOnStage( (*iter)->placementActor ); + } + else + { + Actor self( Self() ); + (*iter)->visual.SetOnStage( self ); + } } } +} - if( mImpl->mBackground ) +void Control::OnStageDisconnection() +{ + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) { - if(mImpl->mBackground->actor.GetRendererCount() > 0 ) + // Check whether the visual is empty, as it is allowed to register a placement actor without visual. + if( (*iter)->visual ) { - Renderer backgroundRenderer = mImpl->mBackground->actor.GetRendererAt( 0 ); - if(backgroundRenderer) + if( (*iter)->placementActor ) { - backgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX+depth ); + (*iter)->visual.SetOffStage( (*iter)->placementActor ); } - } - else - { - - ImageActor imageActor = ImageActor::DownCast( mImpl->mBackground->actor ); - if ( imageActor ) + else { - imageActor.SetSortModifier( BACKGROUND_DEPTH_INDEX+depth ); + Actor self( Self() ); + (*iter)->visual.SetOffStage( self ); } } } } -void Control::OnStageDisconnection() -{ -} - void Control::OnKeyInputFocusGained() { EmitKeyInputFocusSignal( true ); @@ -1006,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) @@ -1072,30 +1085,13 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime Vector3 Control::GetNaturalSize() { - //Control's natural size is the size of its background image if it has been set, or ZERO otherwise - Vector3 naturalSize = Vector3::ZERO; - if( mImpl->mBackground ) + if( mImpl->mBackgroundVisual ) { - if( mImpl->mBackground->actor.GetRendererCount() > 0 ) - { - Material backgroundMaterial = mImpl->mBackground->actor.GetRendererAt(0).GetMaterial(); - if( backgroundMaterial.GetNumberOfSamplers() > 0 ) - { - Image backgroundImage = backgroundMaterial.GetSamplerAt(0).GetImage(); - if( backgroundImage ) - { - naturalSize.x = backgroundImage.GetWidth(); - naturalSize.y = backgroundImage.GetHeight(); - } - } - } - else - { - return mImpl->mBackground->actor.GetNaturalSize(); - } + Vector2 naturalSize; + mImpl->mBackgroundVisual.GetNaturalSize(naturalSize); + return Vector3(naturalSize); } - - return naturalSize; + return Vector3::ZERO; } float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) @@ -1105,27 +1101,11 @@ float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dim float Control::GetHeightForWidth( float width ) { - if( mImpl->mBackground ) - { - Actor actor = mImpl->mBackground->actor; - if( actor ) - { - return actor.GetHeightForWidth( width ); - } - } return GetHeightForWidthBase( width ); } float Control::GetWidthForHeight( float height ) { - if( mImpl->mBackground ) - { - Actor actor = mImpl->mBackground->actor; - if( actor ) - { - return actor.GetWidthForHeight( height ); - } - } return GetWidthForHeightBase( height ); }