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=7cc7571b8ce223f483183bd3b540c23f20eb127c;hp=af2f4cac42f4ea0a623370f26fe3648044e5c9ad;hb=848787435a85536032861126d0feffe7b1870911;hpb=4ac30f392a3277a566a03176ea066841c6784b61 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index af2f4ca..7cc7571 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,97 +163,7 @@ TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &Do DALI_TYPE_REGISTRATION_END() - -const char * const BACKGROUND_COLOR_NAME("color"); - -/** - * Structure which holds information about the background of a control - */ -struct Background -{ - //ToDo: remove this actor and apply the Renderer on the Control - // when the implementation of Actor::RemoveRenderer(Renderer&) is in place. - Actor actor; ///< Background actor - ControlRenderer controlRenderer; ///< The control renderer to render the background - // The background can either be an image or a solid color. - Image image; ///< The background image - Vector4 color; ///< The background color - - /** - * Constructor - */ - Background() - : actor(), - controlRenderer(), - image(), - color( Color::TRANSPARENT ) - { - } -}; - -//ToDo: skip this actor creation and apply the Renderer on the Control -// when the implementation of Actor::RemoveRenderer(Renderer&) is in place. -Actor CreateBackgroundActor() -{ - // Create the actor - Actor actor = Actor::New(); - actor.SetSize( Vector3::ONE ); - actor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); - actor.SetColorMode( USE_PARENT_COLOR ); - - //Constraint scale of the background actor to the size of the control - Constraint constraint = Constraint::New( actor, - Actor::Property::SCALE, - EqualToConstraint() ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); - - return actor; -} - -/** - * @brief Create the background actor for the control. - * - * @param[in] actor The parent actor of the background - * @param[in] color The background color - */ -void CreateBackground( Background& background, const Vector4& color ) -{ - background.actor = CreateBackgroundActor(); - - background.image.Reset(); - background.color = color; - - // Create the control renderer - RendererFactory rendererFactory = Toolkit::RendererFactory::Get(); - background.controlRenderer = rendererFactory.GetControlRenderer(color); - - // ToDo: Call SetOnStage at Control::OnStageConnection and call SetOffStage at Control::OnStageDisconnection; - // Currently Actor::RemoveRenderer doesnot work yet. - background.controlRenderer.SetOnStage( background.actor ); -} - -/** - * @brief Create the background actor for the control. - * - * @param[in] actor The parent actor of the background - * @param[in] image The background image - */ -void CreateBackground( Background& background, const Image& image ) -{ - background.actor = CreateBackgroundActor(); - - background.color = Color::TRANSPARENT; - background.image = image; - - // Create the control renderer - RendererFactory rendererFactory = Toolkit::RendererFactory::Get(); - background.controlRenderer = rendererFactory.GetControlRenderer(image); - - // ToDo: Call SetOnStage at Control::OnStageConnection and call SetOffStage at Control::OnStageDisconnection; - // Currently Actor::RemoveRenderer doesnot work yet. - background.controlRenderer.SetOnStage( background.actor ); -} +const char * const COLOR_RENDERER_COLOR_NAME("blendColor"); } // unnamed namespace @@ -269,7 +178,7 @@ public: Impl(Control& controlImpl) : mControlImpl( controlImpl ), mStyleName(""), - mBackground( NULL ), + mBackgroundRenderer(), mStartingPinchScale( NULL ), mKeyEventSignal(), mPinchGestureDetector(), @@ -286,7 +195,6 @@ public: ~Impl() { // All gesture detectors will be destroyed so no need to disconnect. - delete mBackground; delete mStartingPinchScale; } @@ -312,21 +220,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 /** @@ -350,28 +243,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 { - const Property::Value* colorValue = map->Find( BACKGROUND_COLOR_NAME ); - Vector4 color; - if( colorValue && colorValue->Get(color)) - { - controlImpl.SetBackgroundColor( color ); - break; - } + // An empty map means the background is no longer required + controlImpl.ClearBackground(); } - - // The background is neither an valid image nor a valid color, so it is no longer required - controlImpl.ClearBackground(); break; } @@ -387,6 +279,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; + } } } } @@ -415,23 +322,21 @@ public: break; } - case Toolkit::Control::Property::BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_COLOR: { - Property::Map map; + DALI_LOG_WARNING( "BACKGROUND_COLOR property is deprecated. Use BACKGROUND property instead\n" ); + value = controlImpl.GetBackgroundColor(); + break; + } - Background* back = controlImpl.mImpl->mBackground; - if ( back && back->actor) + 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 ) { - if( back->image ) - { - Scripting::CreatePropertyMap( back->image, map ); - } - else - { - map[BACKGROUND_COLOR_NAME] = back->color; - } + controlImpl.mImpl->mBackgroundRenderer.CreatePropertyMap( map ); } - value = map; break; } @@ -441,6 +346,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; + } + } } @@ -451,7 +369,7 @@ public: Control& mControlImpl; std::string mStyleName; - Background* mBackground; ///< Only create the background if we use it + Toolkit::ControlRenderer mBackgroundRenderer; ///< The control renderer to render the background Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal; Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal; @@ -469,15 +387,19 @@ public: 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() { @@ -521,81 +443,54 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { - Background& background( mImpl->GetBackground() ); - - // The background renderer exits and it is a color renderer, we continue to use the current renderer - if ( background.actor && (!background.image) - && (!Toolkit::RendererFactory::Get().ResetRenderer( background.controlRenderer, color ) )) - { - background.color = color; - } - else - { - // TODO: Apply the new renderer directly, as Actor::RemoveRenderer is not working yet, we create a new actor - if( background.actor ) - { - mImpl->mAddRemoveBackgroundChild = true; - Self().Remove( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; - } - // Create background actor - CreateBackground(background, color ); - mImpl->mAddRemoveBackgroundChild = true; - // The actor does not need to be inserted to guarantee order. - Self().Add( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; - } + Actor self( Self() ); + Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); + factory.ResetRenderer( mImpl->mBackgroundRenderer, self, color ); + mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); } Vector4 Control::GetBackgroundColor() const { - if ( mImpl->mBackground ) + if( mImpl->mBackgroundRenderer && ( &typeid( GetImplementation(mImpl->mBackgroundRenderer) ) == &typeid( ColorRenderer ) ) ) { - return mImpl->mBackground->color; + 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::SetBackgroundImage( Image image ) +void Control::SetBackground(const Property::Map& map) { - Background& background( mImpl->GetBackground() ); - - // The background renderer exits and it is an image renderer, we continue to use the current renderer - if( background.actor && background.image - && (! Toolkit::RendererFactory::Get().ResetRenderer( background.controlRenderer, image ) ) ) - { - background.image = image; - } - else + 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 { - // TODO: Apply the new renderer directly, as Actor::RemoveRenderer is not working yet, we create a new actor - if( background.actor ) - { - mImpl->mAddRemoveBackgroundChild = true; - Self().Remove( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; - } - // Create background actor - CreateBackground(background, image); - mImpl->mAddRemoveBackgroundChild = true; - // The actor does not need to be inserted to guarantee order. - Self().Add( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; + mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); + mImpl->mBackgroundRenderer.SetOnStage( self ); } } -void Control::ClearBackground() +void Control::SetBackgroundImage( Image image ) { - if ( mImpl->mBackground ) - { - Background& background( mImpl->GetBackground() ); - mImpl->mAddRemoveBackgroundChild = true; - Self().Remove( background.actor ); - mImpl->mAddRemoveBackgroundChild = false; + Actor self( Self() ); + Toolkit::RendererFactory factory = Toolkit::RendererFactory::Get(); + factory.ResetRenderer( mImpl->mBackgroundRenderer, self, image ); + mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); +} - delete mImpl->mBackground; - mImpl->mBackground = NULL; - } +void Control::ClearBackground() +{ + Actor self( Self() ); + mImpl->mBackgroundRenderer.RemoveAndReset( self ); } void Control::EnableGestureDetection(Gesture::Type type) @@ -918,24 +813,20 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) void Control::OnStageConnection( int depth ) { - unsigned int controlRendererCount = Self().GetRendererCount(); - for( unsigned int i(0); imBackgroundRenderer) { - Renderer controlRenderer = Self().GetRendererAt(i); - if( controlRenderer ) - { - controlRenderer.SetDepthIndex( CONTENT_DEPTH_INDEX+depth ); - } - } - - if( mImpl->mBackground && mImpl->mBackground->controlRenderer) - { - mImpl->mBackground->controlRenderer.SetDepthIndex( BACKGROUND_DEPTH_INDEX+depth ); + Actor self( Self() ); + mImpl->mBackgroundRenderer.SetOnStage( self ); } } void Control::OnStageDisconnection() { + if( mImpl->mBackgroundRenderer ) + { + Actor self( Self() ); + mImpl->mBackgroundRenderer.SetOffStage( self ); + } } void Control::OnKeyInputFocusGained() @@ -1016,30 +907,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->mBackgroundRenderer ) { - 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->mBackgroundRenderer.GetNaturalSize(naturalSize); + return Vector3(naturalSize); } - - return naturalSize; + return Vector3::ZERO; } float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) @@ -1049,27 +923,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 ); }