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=bb2732c16af08c9919cd3c819eb5704db57019ec;hb=e9d852fcdacc5788785bfe0b617bd757794e8208;hpb=06990b10c42c9f1ec0ec3c44b690d83b8b14b366 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index bb2732c..841e3d3 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -22,23 +22,24 @@ #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 namespace Dali { @@ -49,8 +50,6 @@ namespace Toolkit namespace { -const float BACKGROUND_ACTOR_Z_POSITION( -0.1f ); - /** * Creates control through type registry */ @@ -66,12 +65,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"; -static bool DoAction( BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes ) +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 ) @@ -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 ); @@ -160,94 +159,11 @@ 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; ///< Either a MeshActor or an ImageActor - Vector4 color; ///< The color of the actor. - - /** - * Constructor - */ - Background() - : actor(), - color( Color::WHITE ) - { - } -}; - -/** - * Creates a white coloured Mesh. - */ -Mesh CreateMesh() -{ - Vector3 white( Color::WHITE ); - - MeshData meshData; - - // Create vertices with a white color (actual color is set by actor color) - MeshData::VertexContainer vertices(4); - vertices[ 0 ] = MeshData::Vertex( Vector3( -0.5f, -0.5f, 0.0f ), Vector2::ZERO, white ); - vertices[ 1 ] = MeshData::Vertex( Vector3( 0.5f, -0.5f, 0.0f ), Vector2::ZERO, white ); - vertices[ 2 ] = MeshData::Vertex( Vector3( -0.5f, 0.5f, 0.0f ), Vector2::ZERO, white ); - vertices[ 3 ] = MeshData::Vertex( Vector3( 0.5f, 0.5f, 0.0f ), Vector2::ZERO, white ); - - // Specify all the faces - MeshData::FaceIndices faces; - faces.reserve( 6 ); // 2 triangles in Quad - faces.push_back( 0 ); faces.push_back( 3 ); faces.push_back( 1 ); - faces.push_back( 0 ); faces.push_back( 2 ); faces.push_back( 3 ); - - // Create the mesh data from the vertices and faces - meshData.SetMaterial( Material::New( "ControlMaterial" ) ); - meshData.SetVertices( vertices ); - meshData.SetFaceIndices( faces ); - meshData.SetHasColor( true ); - - return Mesh::New( meshData ); -} - -/** - * Sets all the required properties for the background actor. - * - * @param[in] actor The actor to set the properties on. - * @param[in] color The required color of the actor. - */ -void SetupBackgroundActor( Actor actor, const Vector4& color ) -{ - actor.SetColor( color ); - actor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); - actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); - actor.SetZ( BACKGROUND_ACTOR_Z_POSITION ); - actor.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); -} - -/** - * Sets all the required properties for the background actor. - * - * @param[in] actor The actor to set the properties on. - * @param[in] constrainingIndex The property index to constrain the parent's size on. - * @param[in] color The required color of the actor. - */ -void SetupBackgroundActorConstrained( Actor actor, Property::Index constrainingIndex, const Vector4& color ) -{ - actor.SetColor( color ); - actor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); - actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); - actor.SetZ( BACKGROUND_ACTOR_Z_POSITION ); - - Constraint constraint = Constraint::New( actor, - constrainingIndex, - EqualToConstraint() ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); -} +const char * const COLOR_RENDERER_COLOR_NAME("blendColor"); } // unnamed namespace @@ -260,25 +176,24 @@ public: // Construction & Destruction Impl(Control& controlImpl) - : mControlImpl( controlImpl ), - mStyleName(""), - mBackground( NULL ), - mStartingPinchScale( NULL ), - mKeyEventSignal(), - mPinchGestureDetector(), - mPanGestureDetector(), - mTapGestureDetector(), - mLongPressGestureDetector(), - mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), - mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ) - { - } +: mControlImpl( controlImpl ), + mStyleName(""), + mBackgroundRenderer(), + mStartingPinchScale( NULL ), + mKeyEventSignal(), + mPinchGestureDetector(), + mPanGestureDetector(), + mTapGestureDetector(), + mLongPressGestureDetector(), + mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), + mIsKeyboardNavigationSupported( false ), + mIsKeyboardFocusGroup( false ) +{ +} ~Impl() { // All gesture detectors will be destroyed so no need to disconnect. - delete mBackground; delete mStartingPinchScale; } @@ -304,21 +219,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 /** @@ -345,23 +245,20 @@ 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: { - if ( value.HasKey( "image" ) ) + DALI_LOG_WARNING( "BACKGROUND_IMAGE property is deprecated. Use BACKGROUND property instead\n" ); + Image image = Scripting::NewImage( value ); + if ( image ) { - Property::Map imageMap = value.GetValue( "image" ).Get< Property::Map >(); - Image image = Scripting::NewImage( imageMap ); - - if ( image ) - { - controlImpl.SetBackgroundImage( image ); - } + controlImpl.SetBackgroundImage( image ); } - else if ( value.Get< Property::Map >().Empty() ) + else { // An empty map means the background is no longer required controlImpl.ClearBackground(); @@ -381,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; + } } } } @@ -411,27 +323,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 ) + if( controlImpl.mImpl->mBackgroundRenderer ) { - ImageActor imageActor = ImageActor::DownCast( back->actor ); - if ( imageActor ) - { - Image image = imageActor.GetImage(); - Property::Map imageMap; - Scripting::CreatePropertyMap( image, imageMap ); - map[ "image" ] = imageMap; - } + controlImpl.mImpl->mBackgroundRenderer.CreatePropertyMap( map ); } - value = map; break; } @@ -441,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; + } + } } @@ -451,7 +368,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; @@ -468,17 +385,19 @@ public: bool mIsKeyboardFocusGroup :1; ///< Stores whether the control is a focus group. // 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() { @@ -506,9 +425,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() ) ); + } } } @@ -519,66 +441,54 @@ const std::string& Control::GetStyleName() const void Control::SetBackgroundColor( const Vector4& color ) { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) - { - // Just set the actor color - background.actor.SetColor( color ); - } - else - { - // Create Mesh Actor - MeshActor meshActor = MeshActor::New( CreateMesh() ); - - SetupBackgroundActorConstrained( meshActor, Actor::Property::SCALE, color ); - - // Set the background actor before adding so that we do not inform deriving classes - background.actor = meshActor; - Self().Add( meshActor ); - } - - background.color = color; + 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() ); - - if ( background.actor ) + 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 { - // Remove Current actor, unset AFTER removal so that we do not inform deriving classes - Self().Remove( background.actor ); - background.actor.Reset(); + mImpl->mBackgroundRenderer.SetDepthIndex( DepthIndex::BACKGROUND ); + mImpl->mBackgroundRenderer.SetOnStage( self ); } +} - ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, background.color ); - - // Set the background actor before adding so that we do not inform derived classes - background.actor = imageActor; - Self().Add( imageActor ); +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 ); } void Control::ClearBackground() { - if ( mImpl->mBackground ) - { - Background& background( mImpl->GetBackground() ); - Self().Remove( background.actor ); - - delete mImpl->mBackground; - mImpl->mBackground = NULL; - } + Actor self( Self() ); + mImpl->mBackgroundRenderer.RemoveAndReset( self ); } void Control::EnableGestureDetection(Gesture::Type type) @@ -714,11 +624,22 @@ void Control::AccessibilityActivate() OnAccessibilityActivated(); } +void Control::KeyboardEnter() +{ + // Inform deriving classes + OnKeyboardEnter(); +} + 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 @@ -734,6 +655,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(); @@ -789,24 +715,27 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { + // Call deriving classes so initialised before styling is applied to them. + OnInitialize(); + if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + // if stylemanager is available + if( styleManager ) + { + // Register for style changes + styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - - // SetTheme - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + // Apply the current style + GetImpl( styleManager ).ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + } } if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) { SetKeyboardNavigationSupport( true ); } - - // Calling deriving classes - OnInitialize(); } void Control::OnInitialize() @@ -824,7 +753,7 @@ 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() ) ); } @@ -864,11 +793,11 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) if ( focusGained ) { - // signals are allocated dynamically when someone connects - if ( !mImpl->mKeyInputFocusGainedSignal.Empty() ) - { + // signals are allocated dynamically when someone connects + if ( !mImpl->mKeyInputFocusGainedSignal.Empty() ) + { mImpl->mKeyInputFocusGainedSignal.Emit( handle ); - } + } } else { @@ -880,12 +809,22 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) } } -void Control::OnStageConnection() +void Control::OnStageConnection( int depth ) { + if( mImpl->mBackgroundRenderer) + { + Actor self( Self() ); + mImpl->mBackgroundRenderer.SetOnStage( self ); + } } void Control::OnStageDisconnection() { + if( mImpl->mBackgroundRenderer ) + { + Actor self( Self() ); + mImpl->mBackgroundRenderer.SetOffStage( self ); + } } void Control::OnKeyInputFocusGained() @@ -900,31 +839,23 @@ void Control::OnKeyInputFocusLost() void Control::OnChildAdd(Actor& child) { - // If this is the background actor, then we do not want to relayout or inform deriving classes - if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) - { - return; - } - // Notify derived classes. OnControlChildAdd( child ); } void Control::OnChildRemove(Actor& child) { - // If this is the background actor, then we do not want to relayout or inform deriving classes - if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) - { - 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) @@ -966,15 +897,13 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime Vector3 Control::GetNaturalSize() { - if( mImpl->mBackground ) + if( mImpl->mBackgroundRenderer ) { - Actor actor = mImpl->mBackground->actor; - if( actor ) - { - return actor.GetNaturalSize(); - } + Vector2 naturalSize; + mImpl->mBackgroundRenderer.GetNaturalSize(naturalSize); + return Vector3(naturalSize); } - return Vector3(); + return Vector3::ZERO; } float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) @@ -984,27 +913,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 ); }