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=23745bbf5286c89d5f1db9eb72e0d0588678a61a;hp=88b588d53fca794b76ec24486c48169992e83e5a;hb=a394f6523cfb5c36321d877ca1d4f57c354ebc7d;hpb=31df2b9472ccbe0ae460a958535be8ef790c96f2 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 88b588d..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. @@ -22,23 +22,25 @@ #include // for strcmp #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 +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() @@ -64,12 +93,12 @@ 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_CONTROL_ACTIVATED = "control-activated"; +const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibilityActivated"; static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) { bool ret = false; - if( object && ( 0 == strcmp( actionName.c_str(), ACTION_CONTROL_ACTIVATED ) ) ) + if( object && ( 0 == strcmp( actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED ) ) ) { Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); if( control ) @@ -91,13 +120,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 ); @@ -158,170 +187,10 @@ SignalConnectorType registerSignal5( typeRegistration, SIGNAL_PANNED, &DoConnect SignalConnectorType registerSignal6( typeRegistration, SIGNAL_PINCHED, &DoConnectSignal ); SignalConnectorType registerSignal7( typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal ); -TypeAction registerAction( typeRegistration, ACTION_CONTROL_ACTIVATED, &DoAction ); +TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction ); 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 ) -}; - -struct VertexWithTexture -{ - Vector2 position; - Vector2 texCoord; -}; - -VertexWithTexture gQuadWithTexture[] = { - { Vector2( -0.5f, -0.5f ), Vector2( 0.0f, 0.0f ) }, - { Vector2( 0.5f, -0.5f ), Vector2( 1.0f, 0.0f ) }, - { Vector2( -0.5f, 0.5f ), Vector2( 0.0f, 1.0f ) }, - { Vector2( 0.5f, 0.5f ), Vector2( 1.0f, 1.0f ) } -}; - -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 -); - -const char* VERTEX_SHADER_TEXTURE = DALI_COMPOSE_SHADER( - attribute mediump vec2 aPosition;\n - attribute mediump vec2 aTexCoord;\n - uniform mediump mat4 uMvpMatrix;\n - varying mediump vec2 vTexCoord;\n - void main()\n - {\n - gl_Position = uMvpMatrix * vec4( aPosition, 0.0, 1.0 );\n - vTexCoord = aTexCoord;\n - }\n -); - -const char* FRAGMENT_SHADER_TEXTURE = DALI_COMPOSE_SHADER( - uniform lowp vec4 uBackgroundColor;\n - uniform lowp vec4 uColor;\n - uniform sampler2D sTexture;\n - varying mediump vec2 vTexCoord;\n - - void main()\n - {\n - gl_FragColor = texture2D( sTexture, vTexCoord ) * 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() ) -{ - PropertyBuffer vertexBuffer; - Shader shader; - Material material; - if( image ) - { - Property::Map vertexFormat; - vertexFormat["aPosition"] = Property::VECTOR2; - vertexFormat["aTexCoord"] = Property::VECTOR2; - - //Create a vertex buffer for vertex positions and texture coordinates - vertexBuffer = PropertyBuffer::New( vertexFormat, 4u ); - vertexBuffer.SetData( gQuadWithTexture ); - - shader = Shader::New( VERTEX_SHADER_TEXTURE, FRAGMENT_SHADER_TEXTURE ); - Sampler textureSampler = Sampler::New( image, "sTexture" ); - material = Material::New( shader ); - material.AddSampler(textureSampler); - } - else - { - 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( 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; -} - } // unnamed namespace namespace Internal @@ -335,7 +204,8 @@ public: Impl(Control& controlImpl) : mControlImpl( controlImpl ), mStyleName(""), - mBackground( NULL ), + mBackgroundVisual(), + mBackgroundColor(Color::TRANSPARENT), mStartingPinchScale( NULL ), mKeyEventSignal(), mPinchGestureDetector(), @@ -344,15 +214,13 @@ public: mLongPressGestureDetector(), mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mAddRemoveBackgroundChild( false ) + mIsKeyboardFocusGroup( false ) { } ~Impl() { // All gesture detectors will be destroyed so no need to disconnect. - delete mBackground; delete mStartingPinchScale; } @@ -378,21 +246,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 /** @@ -419,12 +272,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 ) { @@ -450,6 +305,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; + } } } } @@ -480,24 +350,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 && back->actor.GetRendererAt(0).GetMaterial().GetNumberOfSamplers() > 0) + if( controlImpl.mImpl->mBackgroundVisual ) { - Image image = back->actor.GetRendererAt(0).GetMaterial().GetSamplerAt(0).GetImage(); - if ( image ) - { - Scripting::CreatePropertyMap( image, map ); - } + controlImpl.mImpl->mBackgroundVisual.CreatePropertyMap( map ); } - value = map; break; } @@ -507,6 +372,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; + } + } } @@ -516,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; - 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; @@ -532,20 +412,21 @@ 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 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() { @@ -573,9 +454,12 @@ void Control::SetStyleName( const std::string& styleName ) { mImpl->mStyleName = styleName; - // Apply new style + // Apply new style, if stylemanager is available Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + if( styleManager ) + { + GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + } } } @@ -586,78 +470,48 @@ 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; + InitializeVisual( self, mImpl->mBackgroundVisual, map ); + if( mImpl->mBackgroundVisual ) { - Shader shader = background.actor.GetRendererAt(0).GetMaterial().GetShader(); - shader.SetProperty( shader.GetPropertyIndex("uBackgroundColor"), 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() ); + InitializeVisual( self, mImpl->mBackgroundVisual, map ); + 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 || background.actor.GetRendererAt(0).GetMaterial().GetNumberOfSamplers() == 0) - { - // Remove current actor as it has not texture coordinates - if( background.actor ) - { - mImpl->mAddRemoveBackgroundChild = true; - Self().Remove( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; - background.actor.Reset(); - } - - //Create a new actor with texture coordinates - Actor actor = CreateBackground(Self(), background.color, image); - mImpl->mAddRemoveBackgroundChild = true; - // use insert to guarantee its the first child (so that OVERLAY mode works) - Self().Insert( 0, actor ); - mImpl->mAddRemoveBackgroundChild = false; - background.actor = actor; - } - else + Actor self( Self() ); + InitializeVisual( self, mImpl->mBackgroundVisual, image ); + if( mImpl->mBackgroundVisual ) { - //Change sampler image - Sampler sampler = background.actor.GetRendererAt(0).GetMaterial().GetSamplerAt(0); - sampler.SetImage(image); + 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) @@ -793,11 +647,89 @@ void Control::AccessibilityActivate() OnAccessibilityActivated(); } +void Control::KeyboardEnter() +{ + // Inform deriving classes + 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 } +bool Control::OnKeyboardEnter() +{ + return false; // Keyboard enter is not handled by default +} + bool Control::OnAccessibilityPan(PanGesture gesture) { return false; // Accessibility pan gesture is not handled by default @@ -813,6 +745,11 @@ bool Control::OnAccessibilityValueChange(bool isIncrease) return false; // Accessibility value change action is not handled by default } +bool Control::OnAccessibilityZoom() +{ + return false; // Accessibility zoom action is not handled by default +} + Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) { return Actor(); @@ -827,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; } @@ -873,13 +810,19 @@ void Control::Initialize() if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { - Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + Toolkit::StyleManager styleManager = StyleManager::Get(); - // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); + // if stylemanager is available + if( styleManager ) + { + StyleManager& styleManagerImpl = GetImpl( styleManager ); - // Apply the current style - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + // Register for style changes + styleManagerImpl.ControlStyleChangeSignal().Connect( this, &Control::OnStyleChange ); + + // Apply the current style + styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + } } if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) @@ -903,10 +846,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) @@ -959,30 +903,22 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) } } -void Control::OnStageConnection( unsigned int depth ) +void Control::OnStageConnection( int depth ) { - unsigned int controlRendererCount = Self().GetRendererCount(); - for( unsigned int i(0); imBackgroundVisual) { - Renderer controlRenderer = Self().GetRendererAt(i); - if( controlRenderer ) - { - controlRenderer.SetDepthIndex( CONTENT_DEPTH_INDEX+depth ); - } - } - - if( mImpl->mBackground ) - { - Renderer backgroundRenderer = mImpl->mBackground->actor.GetRendererAt( 0 ); - if(backgroundRenderer) - { - backgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX+depth ); - } + Actor self( Self() ); + mImpl->mBackgroundVisual.SetOnStage( self ); } } void Control::OnStageDisconnection() { + if( mImpl->mBackgroundVisual ) + { + Actor self( Self() ); + mImpl->mBackgroundVisual.SetOffStage( self ); + } } void Control::OnKeyInputFocusGained() @@ -997,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) @@ -1063,23 +991,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 ) { - 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(); - } - } + Vector2 naturalSize; + mImpl->mBackgroundVisual.GetNaturalSize(naturalSize); + return Vector3(naturalSize); } - - return naturalSize; + return Vector3::ZERO; } float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) @@ -1089,27 +1007,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 ); }