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=841e3d35c471ba0be881ba68fbc3c940568876c5;hp=c3ca7855b6dc5e6551c641e5ab8bfd43819b1bcf;hb=e9d852fcdacc5788785bfe0b617bd757794e8208;hpb=5eac3823385c43627c80d0f10f2aa1b3465cb250 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index c3ca785..841e3d3 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -32,15 +32,14 @@ #include // INTERNAL INCLUDES -#include -#include -#include #include #include +#include +#include +#include #include #include #include -#include namespace Dali { @@ -66,7 +65,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; @@ -93,13 +92,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 ); @@ -164,7 +163,7 @@ 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 @@ -188,8 +187,7 @@ public: mLongPressGestureDetector(), mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mAddRemoveBackgroundChild( false ) + mIsKeyboardFocusGroup( false ) { } @@ -244,23 +242,27 @@ public: controlImpl.SetStyleName( value.Get< std::string >() ); break; } - case Toolkit::Control::Property::BACKGROUND: + + 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 ) { controlImpl.SetBackgroundImage( image ); - break; } - const Property::Map* map = value.GetMap(); - if( map ) + else { - controlImpl.SetBackground( *map ); - break; + // An empty map means the background is no longer required + controlImpl.ClearBackground(); } - - // The background is neither a valid image nor a property map, so it is no longer required - controlImpl.ClearBackground(); break; } @@ -276,6 +278,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; + } } } } @@ -304,14 +321,21 @@ public: break; } - case Toolkit::Control::Property::BACKGROUND: + 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; if( controlImpl.mImpl->mBackgroundRenderer ) { - (controlImpl.mImpl->mBackgroundRenderer).CreatePropertyMap( map ); + controlImpl.mImpl->mBackgroundRenderer.CreatePropertyMap( map ); } - value = map; break; } @@ -321,6 +345,19 @@ public: value = controlImpl.HasKeyInputFocus(); break; } + + case Toolkit::Control::Property::BACKGROUND: + { + Property::Map map; + if( controlImpl.mImpl->mBackgroundRenderer ) + { + (controlImpl.mImpl->mBackgroundRenderer).CreatePropertyMap( map ); + } + + value = map; + break; + } + } } @@ -346,18 +383,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 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", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_3( 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() { @@ -403,55 +443,36 @@ void Control::SetBackgroundColor( const Vector4& color ) { Actor self( Self() ); Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); - - if( mImpl->mBackgroundRenderer ) - { - Toolkit::ControlRenderer currentRenderer( mImpl->mBackgroundRenderer ); - // if ResetRenderer returns false, we continue to use the current renderer with a new color set to it. - if( ! factory.ResetRenderer( mImpl->mBackgroundRenderer, color ) ) - { - return; - } - // ResetRenderer returns true, a new renderer is created. Remove the current renderer and reset. - currentRenderer.RemoveAndReset( self ); - } - else - { - mImpl->mBackgroundRenderer = factory.GetControlRenderer( color ); - } - - if( self.OnStage() ) - { - mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); - mImpl->mBackgroundRenderer.SetOnStage( self ); - } + factory.ResetRenderer( mImpl->mBackgroundRenderer, self, color ); + mImpl->mBackgroundRenderer.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; } 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 ); - - // mBackgroundRenderer might be empty, if an invalid map is provided, no background. - if( self.OnStage() && mImpl->mBackgroundRenderer) + if( mImpl->mBackgroundRenderer && self.OnStage() ) // Request control renderer with a property map might return an empty handle { - mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); + mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); mImpl->mBackgroundRenderer.SetOnStage( self ); } } @@ -460,33 +481,13 @@ void Control::SetBackgroundImage( Image image ) { Actor self( Self() ); Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); - - if( mImpl->mBackgroundRenderer ) - { - Toolkit::ControlRenderer currentRenderer( mImpl->mBackgroundRenderer ); - // if ResetRenderer returns false, we continue to use the current renderer with a new image set to it. - if( ! factory.ResetRenderer( mImpl->mBackgroundRenderer, image ) ) - { - return; - } - // ResetRenderer returns true, a new renderer is created. Remove the current renderer and reset. - currentRenderer.RemoveAndReset( self ); - } - else - { - mImpl->mBackgroundRenderer = factory.GetControlRenderer( image ); - } - - if( self.OnStage() ) - { - mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); - mImpl->mBackgroundRenderer.SetOnStage( self ); - } + factory.ResetRenderer( mImpl->mBackgroundRenderer, self, image ); + mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); } void Control::ClearBackground() { - Actor self(Self()); + Actor self( Self() ); mImpl->mBackgroundRenderer.RemoveAndReset( self ); } @@ -810,29 +811,18 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { - unsigned int controlRendererCount = Self().GetRendererCount(); - for( unsigned int i(0); imBackgroundRenderer) { - mImpl->mBackgroundRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX ); - Actor self(Self()); + Actor self( Self() ); mImpl->mBackgroundRenderer.SetOnStage( self ); } } void Control::OnStageDisconnection() { - if( mImpl->mBackgroundRenderer) + if( mImpl->mBackgroundRenderer ) { - Actor self(Self()); + Actor self( Self() ); mImpl->mBackgroundRenderer.SetOffStage( self ); } } @@ -849,31 +839,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->mBackgroundRenderer ) + { + Vector2 size( targetSize ); + mImpl->mBackgroundRenderer.SetSize( size ); + } } void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize)