X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=23745bbf5286c89d5f1db9eb72e0d0588678a61a;hb=a394f6523cfb5c36321d877ca1d4f57c354ebc7d;hp=d655a3ba75c277d584b1921a62d8d82839a57285;hpb=2cc8d741a802e8d79b4da15329aa8328b68c7c34;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index d655a3b..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 +#include #include // INTERNAL INCLUDES -#include #include #include -#include +#include +#include +#include +#include +#include #include +#include namespace Dali { @@ -49,115 +51,146 @@ namespace Toolkit namespace { -const float BACKGROUND_ACTOR_Z_POSITION( -0.1f ); - -BaseHandle Create() +/** + * Struct used to store Visual within the control, index is a unique key for each visual. + */ +struct RegisteredVisual { - return Internal::Control::New(); -} + Property::Index index; + Toolkit::Visual::Base visual; + Actor placementActor; -// Setup signals and actions using the type-registry. -DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); - -// Note: Properties are registered separately below. - -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "key-event", SIGNAL_KEY_EVENT ) -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "key-input-focus-gained", SIGNAL_KEY_INPUT_FOCUS_GAINED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "key-input-focus-lost", SIGNAL_KEY_INPUT_FOCUS_LOST ) -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "tapped", SIGNAL_TAPPED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "panned", SIGNAL_PANNED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "pinched", SIGNAL_PINCHED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Control, "long-pressed", SIGNAL_LONG_PRESSED ) - -DALI_ACTION_REGISTRATION( Toolkit, Control, "control-activated", ACTION_CONTROL_ACTIVATED ) - -DALI_TYPE_REGISTRATION_END() + RegisteredVisual( Property::Index aIndex, Toolkit::Visual::Base &aVisual, Actor &aPlacementActor) : index(aIndex), visual(aVisual), placementActor(aPlacementActor) {} +}; /** - * Structure which holds information about the background of a control + * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter */ -struct Background +bool FindVisual( Property::Index targetIndex, std::vector& visuals, std::vector::iterator& iter ) { - Actor actor; ///< Either a MeshActor or an ImageActor - Vector4 color; ///< The color of the actor. - - /** - * Constructor - */ - Background() - : actor(), - color( Color::WHITE ) + for ( iter = visuals.begin(); iter != visuals.end(); iter++ ) { + if ( (*iter).index == targetIndex ) + { + return true; + } } -}; + return false; +} /** - * Creates a white coloured Mesh. + * Creates control through type registry */ -Mesh CreateMesh() +BaseHandle Create() { - 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 ); + return Internal::Control::New(); } /** - * 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. + * Performs actions as requested using the action name. + * @param[in] object The object on which to perform the action. + * @param[in] actionName The action to perform. + * @param[in] attributes The attributes with which to perfrom this action. + * @return true if action has been accepted by this control */ -void SetupBackgroundActor( Actor actor, const Vector4& color ) +const char* ACTION_ACCESSIBILITY_ACTIVATED = "accessibilityActivated"; +static bool DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) { - 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 ); + bool ret = false; + + if( object && ( 0 == strcmp( actionName.c_str(), ACTION_ACCESSIBILITY_ACTIVATED ) ) ) + { + Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); + if( control ) + { + // if cast succeeds there is an implementation so no need to check + ret = Internal::GetImplementation( control ).OnAccessibilityActivated(); + } + } + + return ret; } /** - * 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. + * Connects a callback function with the object's signals. + * @param[in] object The object providing the signal. + * @param[in] tracker Used to disconnect the signal. + * @param[in] signalName The signal to connect to. + * @param[in] functor A newly allocated FunctorDelegate. + * @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. */ -void SetupBackgroundActorConstrained( Actor actor, Property::Index constrainingIndex, const Vector4& color ) +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 = "longPressed"; +static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { - actor.SetColor( color ); - actor.SetPositionInheritanceMode( USE_PARENT_POSITION_PLUS_LOCAL_POSITION ); - actor.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR ); - actor.SetZ( BACKGROUND_ACTOR_Z_POSITION ); + Dali::BaseHandle handle( object ); + + bool connected( false ); + Toolkit::Control control = Toolkit::Control::DownCast( handle ); + if ( control ) + { + Internal::Control& controlImpl( Internal::GetImplementation( control ) ); + connected = true; - Constraint constraint = Constraint::New( actor, - constrainingIndex, - EqualToConstraint() ); - constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); - constraint.Apply(); + if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) + { + controlImpl.KeyEventSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_GAINED ) ) + { + controlImpl.KeyInputFocusGainedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST ) ) + { + controlImpl.KeyInputFocusLostSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_TAPPED ) ) + { + controlImpl.EnableGestureDetection( Gesture::Tap ); + controlImpl.GetTapGestureDetector().DetectedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_PANNED ) ) + { + controlImpl.EnableGestureDetection( Gesture::Pan ); + controlImpl.GetPanGestureDetector().DetectedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_PINCHED ) ) + { + controlImpl.EnableGestureDetection( Gesture::Pinch ); + controlImpl.GetPinchGestureDetector().DetectedSignal().Connect( tracker, functor ); + } + else if( 0 == strcmp( signalName.c_str(), SIGNAL_LONG_PRESSED ) ) + { + controlImpl.EnableGestureDetection( Gesture::LongPress ); + controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor ); + } + } + return connected; } +// Setup signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create ); + +// Note: Properties are registered separately below. + +SignalConnectorType registerSignal1( typeRegistration, SIGNAL_KEY_EVENT, &DoConnectSignal ); +SignalConnectorType registerSignal2( typeRegistration, SIGNAL_KEY_INPUT_FOCUS_GAINED, &DoConnectSignal ); +SignalConnectorType registerSignal3( typeRegistration, SIGNAL_KEY_INPUT_FOCUS_LOST, &DoConnectSignal ); +SignalConnectorType registerSignal4( typeRegistration, SIGNAL_TAPPED, &DoConnectSignal ); +SignalConnectorType registerSignal5( typeRegistration, SIGNAL_PANNED, &DoConnectSignal ); +SignalConnectorType registerSignal6( typeRegistration, SIGNAL_PINCHED, &DoConnectSignal ); +SignalConnectorType registerSignal7( typeRegistration, SIGNAL_LONG_PRESSED, &DoConnectSignal ); + +TypeAction registerAction( typeRegistration, ACTION_ACCESSIBILITY_ACTIVATED, &DoAction ); + +DALI_TYPE_REGISTRATION_END() + } // unnamed namespace namespace Internal @@ -169,25 +202,25 @@ 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(""), + mBackgroundVisual(), + mBackgroundColor(Color::TRANSPARENT), + 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; } @@ -213,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 /** @@ -254,23 +272,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(); @@ -290,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; + } } } } @@ -320,27 +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 ) + if( controlImpl.mImpl->mBackgroundVisual ) { - ImageActor imageActor = ImageActor::DownCast( back->actor ); - if ( imageActor ) - { - Image image = imageActor.GetImage(); - Property::Map imageMap; - Scripting::CreatePropertyMap( image, imageMap ); - map[ "image" ] = imageMap; - } + controlImpl.mImpl->mBackgroundVisual.CreatePropertyMap( map ); } - value = map; break; } @@ -350,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; + } + } } @@ -359,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; @@ -377,17 +414,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() { @@ -409,166 +448,184 @@ Control::~Control() delete mImpl; } -void Control::SetKeyInputFocus() +void Control::SetStyleName( const std::string& styleName ) { - if( Self().OnStage() ) + if( styleName != mImpl->mStyleName ) { - Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); + mImpl->mStyleName = styleName; + + // Apply new style, if stylemanager is available + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + if( styleManager ) + { + GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + } } } -bool Control::HasKeyInputFocus() +const std::string& Control::GetStyleName() const { - bool result = false; - if( Self().OnStage() ) - { - result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); - } - return result; + return mImpl->mStyleName; } -void Control::ClearKeyInputFocus() +void Control::SetBackgroundColor( const Vector4& color ) { - if( Self().OnStage() ) + 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 ) { - Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); } } -PinchGestureDetector Control::GetPinchGestureDetector() const -{ - return mImpl->mPinchGestureDetector; -} - -PanGestureDetector Control::GetPanGestureDetector() const -{ - return mImpl->mPanGestureDetector; -} - -TapGestureDetector Control::GetTapGestureDetector() const +Vector4 Control::GetBackgroundColor() const { - return mImpl->mTapGestureDetector; + return mImpl->mBackgroundColor; } -LongPressGestureDetector Control::GetLongPressGestureDetector() const +void Control::SetBackground( const Property::Map& map ) { - return mImpl->mLongPressGestureDetector; + Actor self( Self() ); + InitializeVisual( self, mImpl->mBackgroundVisual, map ); + if( mImpl->mBackgroundVisual ) + { + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); + } } -void Control::SetStyleName( const std::string& styleName ) +void Control::SetBackgroundImage( Image image ) { - if( styleName != mImpl->mStyleName ) + Actor self( Self() ); + InitializeVisual( self, mImpl->mBackgroundVisual, image ); + if( mImpl->mBackgroundVisual ) { - mImpl->mStyleName = styleName; - - // Apply new style - Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + mImpl->mBackgroundVisual.SetDepthIndex( DepthIndex::BACKGROUND ); } } -const std::string& Control::GetStyleName() const +void Control::ClearBackground() { - return mImpl->mStyleName; + Actor self( Self() ); + mImpl->mBackgroundVisual.RemoveAndReset( self ); + mImpl->mBackgroundColor = Color::TRANSPARENT; } -void Control::SetBackgroundColor( const Vector4& color ) +void Control::EnableGestureDetection(Gesture::Type type) { - Background& background( mImpl->GetBackground() ); - - if ( background.actor ) + if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) { - // Just set the actor color - background.actor.SetColor( color ); + mImpl->mPinchGestureDetector = PinchGestureDetector::New(); + mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); + mImpl->mPinchGestureDetector.Attach(Self()); } - 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 ); + if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) + { + mImpl->mPanGestureDetector = PanGestureDetector::New(); + mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); + mImpl->mPanGestureDetector.Attach(Self()); } - background.color = color; -} + if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector ) + { + mImpl->mTapGestureDetector = TapGestureDetector::New(); + mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected); + mImpl->mTapGestureDetector.Attach(Self()); + } -Vector4 Control::GetBackgroundColor() const -{ - if ( mImpl->mBackground ) + if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector ) { - return mImpl->mBackground->color; + mImpl->mLongPressGestureDetector = LongPressGestureDetector::New(); + mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected); + mImpl->mLongPressGestureDetector.Attach(Self()); } - return Color::TRANSPARENT; } -void Control::SetBackgroundImage( Image image ) +void Control::DisableGestureDetection(Gesture::Type type) { - Background& background( mImpl->GetBackground() ); + if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) + { + mImpl->mPinchGestureDetector.Detach(Self()); + mImpl->mPinchGestureDetector.Reset(); + } - if ( background.actor ) + if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector ) { - // Remove Current actor, unset AFTER removal so that we do not inform deriving classes - Self().Remove( background.actor ); - background.actor.Reset(); + mImpl->mPanGestureDetector.Detach(Self()); + mImpl->mPanGestureDetector.Reset(); } - ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, background.color ); + if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector ) + { + mImpl->mTapGestureDetector.Detach(Self()); + mImpl->mTapGestureDetector.Reset(); + } - // Set the background actor before adding so that we do not inform derived classes - background.actor = imageActor; - Self().Add( imageActor ); + if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) + { + mImpl->mLongPressGestureDetector.Detach(Self()); + mImpl->mLongPressGestureDetector.Reset(); + } } -void Control::ClearBackground() +PinchGestureDetector Control::GetPinchGestureDetector() const { - if ( mImpl->mBackground ) - { - Background& background( mImpl->GetBackground() ); - Self().Remove( background.actor ); + return mImpl->mPinchGestureDetector; +} - delete mImpl->mBackground; - mImpl->mBackground = NULL; - } +PanGestureDetector Control::GetPanGestureDetector() const +{ + return mImpl->mPanGestureDetector; } -void Control::SetKeyboardNavigationSupport(bool isSupported) +TapGestureDetector Control::GetTapGestureDetector() const { - mImpl->mIsKeyboardNavigationSupported = isSupported; + return mImpl->mTapGestureDetector; } -bool Control::IsKeyboardNavigationSupported() +LongPressGestureDetector Control::GetLongPressGestureDetector() const { - return mImpl->mIsKeyboardNavigationSupported; + return mImpl->mLongPressGestureDetector; } -void Control::Activate() +void Control::SetKeyboardNavigationSupport(bool isSupported) { - // Inform deriving classes - OnAccessibilityActivated(); + mImpl->mIsKeyboardNavigationSupported = isSupported; } -void Control::OnAccessibilityActivated() +bool Control::IsKeyboardNavigationSupported() { + return mImpl->mIsKeyboardNavigationSupported; } -bool Control::OnAccessibilityPan(PanGesture gesture) +void Control::SetKeyInputFocus() { - return false; // Accessibility pan gesture is not handled by default + if( Self().OnStage() ) + { + Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); + } } -bool Control::OnAccessibilityTouch(const TouchEvent& touchEvent) +bool Control::HasKeyInputFocus() { - return false; // Accessibility touch event is not handled by default + bool result = false; + if( Self().OnStage() ) + { + result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); + } + return result; } -bool Control::OnAccessibilityValueChange(bool isIncrease) +void Control::ClearKeyInputFocus() { - return false; // Accessibility value change action is not handled by default + if( Self().OnStage() ) + { + Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); + } } void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) @@ -584,82 +641,122 @@ bool Control::IsKeyboardFocusGroup() return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self()); } -Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled) +void Control::AccessibilityActivate() { - return Actor(); + // Inform deriving classes + OnAccessibilityActivated(); } -void Control::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) +void Control::KeyboardEnter() { + // Inform deriving classes + OnKeyboardEnter(); } -bool Control::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) +void Control::RegisterVisual( Property::Index index, Actor placementActor, Toolkit::Visual::Base visual ) { - bool ret = false; + bool visualReplaced ( false ); + Actor actorToRegister; // Null actor, replaced if placement actor not Self - if( object && ( 0 == strcmp( actionName.c_str(), ACTION_CONTROL_ACTIVATED ) ) ) + if ( placementActor != Self() ) // Prevent increasing ref count if actor self { - Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); - if( control ) - { - // if cast succeeds there is an implementation so no need to check - GetImplementation( control ).OnAccessibilityActivated(); - } + actorToRegister = placementActor; } - return ret; + 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 ); + } } -bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +void Control::UnregisterVisual( Property::Index index ) { - Dali::BaseHandle handle( object ); + std::vector< RegisteredVisual >::iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + mImpl->mVisuals.erase( iter ); + } +} - bool connected( false ); - Toolkit::Control control = Toolkit::Control::DownCast( handle ); - if ( control ) +Toolkit::Visual::Base Control::GetVisual( Property::Index index ) +{ + std::vector< RegisteredVisual >::iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) { - Control& controlImpl( GetImplementation( control ) ); - connected = true; + return (*iter).visual; + } - if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) - { - controlImpl.KeyEventSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_GAINED ) ) - { - controlImpl.KeyInputFocusGainedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_INPUT_FOCUS_LOST ) ) - { - controlImpl.KeyInputFocusLostSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_TAPPED ) ) - { - controlImpl.EnableGestureDetection( Gesture::Tap ); - controlImpl.GetTapGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_PANNED ) ) - { - controlImpl.EnableGestureDetection( Gesture::Pan ); - controlImpl.GetPanGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_PINCHED ) ) - { - controlImpl.EnableGestureDetection( Gesture::Pinch ); - controlImpl.GetPinchGestureDetector().DetectedSignal().Connect( tracker, functor ); - } - else if( 0 == strcmp( signalName.c_str(), SIGNAL_LONG_PRESSED ) ) + return Toolkit::Visual::Base(); +} + +Actor Control::GetPlacementActor( Property::Index index ) +{ + std::vector< RegisteredVisual >::iterator iter; + if ( FindVisual( index, mImpl->mVisuals, iter ) ) + { + if( (*iter).placementActor ) { - controlImpl.EnableGestureDetection( Gesture::LongPress ); - controlImpl.GetLongPressGestureDetector().DetectedSignal().Connect( tracker, functor ); + return (*iter).placementActor; } else { - // signalName does not match any signal - connected = false; + return Self(); } } - return connected; + + 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 +} + +bool Control::OnAccessibilityTouch(const TouchEvent& touchEvent) +{ + return false; // Accessibility touch event is not handled by default +} + +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(); +} + +void Control::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) +{ } Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() @@ -667,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; } @@ -708,81 +805,29 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { - if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) - { - Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - - // Register for style changes - styleManager.StyleChangeSignal().Connect( this, &Control::OnStyleChange ); - - // SetTheme - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); - } - - if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) - { - SetKeyboardNavigationSupport( true ); - } - - // Calling deriving classes + // Call deriving classes so initialised before styling is applied to them. OnInitialize(); -} -void Control::EnableGestureDetection(Gesture::Type type) -{ - if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) - { - mImpl->mPinchGestureDetector = PinchGestureDetector::New(); - mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); - mImpl->mPinchGestureDetector.Attach(Self()); - } - - if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) + if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { - mImpl->mPanGestureDetector = PanGestureDetector::New(); - mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); - mImpl->mPanGestureDetector.Attach(Self()); - } + Toolkit::StyleManager styleManager = StyleManager::Get(); - if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector ) - { - mImpl->mTapGestureDetector = TapGestureDetector::New(); - mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected); - mImpl->mTapGestureDetector.Attach(Self()); - } - - if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector ) - { - mImpl->mLongPressGestureDetector = LongPressGestureDetector::New(); - mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected); - mImpl->mLongPressGestureDetector.Attach(Self()); - } -} + // if stylemanager is available + if( styleManager ) + { + StyleManager& styleManagerImpl = GetImpl( styleManager ); -void Control::DisableGestureDetection(Gesture::Type type) -{ - if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) - { - mImpl->mPinchGestureDetector.Detach(Self()); - mImpl->mPinchGestureDetector.Reset(); - } + // Register for style changes + styleManagerImpl.ControlStyleChangeSignal().Connect( this, &Control::OnStyleChange ); - if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector ) - { - mImpl->mPanGestureDetector.Detach(Self()); - mImpl->mPanGestureDetector.Reset(); - } - - if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector ) - { - mImpl->mTapGestureDetector.Detach(Self()); - mImpl->mTapGestureDetector.Reset(); + // Apply the current style + styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + } } - if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) + if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) { - mImpl->mLongPressGestureDetector.Detach(Self()); - mImpl->mLongPressGestureDetector.Reset(); + SetKeyboardNavigationSupport( true ); } } @@ -790,14 +835,6 @@ void Control::OnInitialize() { } -void Control::OnControlStageConnection() -{ -} - -void Control::OnControlStageDisconnection() -{ -} - void Control::OnControlChildAdd( Actor& child ) { } @@ -809,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) @@ -843,21 +881,17 @@ void Control::OnLongPress( const LongPressGesture& longPress ) { } -void Control::OnControlSizeSet( const Vector3& size ) -{ -} - void Control::EmitKeyInputFocusSignal( bool focusGained ) { Dali::Toolkit::Control handle( GetOwner() ); 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 { @@ -869,58 +903,53 @@ void Control::EmitKeyInputFocusSignal( bool focusGained ) } } -void Control::OnKeyInputFocusGained() +void Control::OnStageConnection( int depth ) { - EmitKeyInputFocusSignal( true ); + if( mImpl->mBackgroundVisual) + { + Actor self( Self() ); + mImpl->mBackgroundVisual.SetOnStage( self ); + } } -void Control::OnKeyInputFocusLost() +void Control::OnStageDisconnection() { - EmitKeyInputFocusSignal( false ); + if( mImpl->mBackgroundVisual ) + { + Actor self( Self() ); + mImpl->mBackgroundVisual.SetOffStage( self ); + } } -void Control::OnStageConnection() +void Control::OnKeyInputFocusGained() { - // Notify derived classes. - OnControlStageConnection(); + EmitKeyInputFocusSignal( true ); } -void Control::OnStageDisconnection() +void Control::OnKeyInputFocusLost() { - // Notify derived classes - OnControlStageDisconnection(); + EmitKeyInputFocusSignal( false ); } 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 - - // Notify derived classes. - OnControlSizeSet( targetSize ); + if( mImpl->mBackgroundVisual ) + { + Vector2 size( targetSize ); + mImpl->mBackgroundVisual.SetSize( size ); + } } void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize) @@ -943,7 +972,7 @@ bool Control::OnKeyEvent(const KeyEvent& event) return false; // Do not consume } -bool Control::OnMouseWheelEvent(const MouseWheelEvent& event) +bool Control::OnWheelEvent(const WheelEvent& event) { return false; // Do not consume } @@ -962,15 +991,13 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime Vector3 Control::GetNaturalSize() { - if( mImpl->mBackground ) + if( mImpl->mBackgroundVisual ) { - Actor actor = mImpl->mBackground->actor; - if( actor ) - { - return actor.GetNaturalSize(); - } + Vector2 naturalSize; + mImpl->mBackgroundVisual.GetNaturalSize(naturalSize); + return Vector3(naturalSize); } - return Vector3(); + return Vector3::ZERO; } float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) @@ -980,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 ); }