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=d4886a51b830431c301f8a5d3aa2dbb2f5c9d2f9;hp=b495d1ff17a765ad0b6fa24aa312c94a21291958;hb=e5d428fa360321eaf40a95e80cff3de48d59ccff;hpb=cc82bd9b187cda8fe2c8336b73fd1fa9376cfebd diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index b495d1f..d4886a5 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) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2015 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. @@ -19,16 +19,17 @@ #include // EXTERNAL INCLUDES +#include // for strcmp +#include #include #include -#include -#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include #include @@ -36,7 +37,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -48,31 +49,116 @@ namespace Toolkit namespace { -#if defined(DEBUG_ENABLED) -Integration::Log::Filter* gLogFilter = Integration::Log::Filter::New(Debug::NoLogging, false, "LOG_CONTROL"); -#endif - -const float MAX_FLOAT_VALUE( std::numeric_limits::max() ); -const Vector3 MAX_SIZE( MAX_FLOAT_VALUE, MAX_FLOAT_VALUE, MAX_FLOAT_VALUE ); -const float BACKGROUND_ACTOR_Z_POSITION( -0.1f ); - +/** + * Creates control through type registry + */ BaseHandle Create() { return Internal::Control::New(); } +/** + * 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 + */ +const char* ACTION_CONTROL_ACTIVATED = "control-activated"; +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 ) ) ) + { + 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; +} + +/** + * 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. + */ +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_TAPPED = "tapped"; +const char* SIGNAL_PANNED = "panned"; +const char* SIGNAL_PINCHED = "pinched"; +const char* SIGNAL_LONG_PRESSED = "long-pressed"; +static bool DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +{ + Dali::BaseHandle handle( object ); + + bool connected( false ); + Toolkit::Control control = Toolkit::Control::DownCast( handle ); + if ( control ) + { + Internal::Control& controlImpl( Internal::GetImplementation( control ) ); + connected = true; + + 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, +// Note: Properties are registered separately below. -DALI_SIGNAL_REGISTRATION( Control, "key-event", SIGNAL_KEY_EVENT ) -DALI_SIGNAL_REGISTRATION( Control, "tapped", SIGNAL_TAPPED ) -DALI_SIGNAL_REGISTRATION( Control, "panned", SIGNAL_PANNED ) -DALI_SIGNAL_REGISTRATION( Control, "pinched", SIGNAL_PINCHED ) -DALI_SIGNAL_REGISTRATION( Control, "long-pressed", SIGNAL_LONG_PRESSED ) +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 ); -DALI_ACTION_REGISTRATION( Control, "control-activated", ACTION_CONTROL_ACTIVATED ) +TypeAction registerAction( typeRegistration, ACTION_CONTROL_ACTIVATED, &DoAction ); DALI_TYPE_REGISTRATION_END() @@ -129,17 +215,34 @@ Mesh CreateMesh() * 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.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 SetupBackgroundActor( Actor actor, Property::Index constrainingIndex, const Vector4& color ) +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 ); - actor.SetRelayoutEnabled( true ); - actor.SetResizePolicy( FILL_TO_PARENT, ALL_DIMENSIONS ); + + Constraint constraint = Constraint::New( actor, + constrainingIndex, + EqualToConstraint() ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.Apply(); } } // unnamed namespace @@ -151,16 +254,6 @@ class Control::Impl : public ConnectionTracker { public: - /** - * Size indices for mMinMaxSize array - */ - enum - { - MIN_SIZE_INDEX = 0, - MAX_SIZE_INDEX = 1 - }; - -public: // Construction & Destruction Impl(Control& controlImpl) : mControlImpl( controlImpl ), @@ -172,12 +265,10 @@ public: mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), - mFlags( Control::CONTROL_BEHAVIOUR_NONE ), + mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), mIsKeyboardFocusGroup( false ), - mInitialized( false ) + mAddRemoveBackgroundChild( false ) { } @@ -239,7 +330,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -305,7 +396,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -325,10 +416,10 @@ public: { Property::Map map; - Actor actor = controlImpl.GetBackgroundActor(); - if ( actor ) + Background* back = controlImpl.mImpl->mBackground; + if( back ) { - ImageActor imageActor = ImageActor::DownCast( actor ); + ImageActor imageActor = ImageActor::DownCast( back->actor ); if ( imageActor ) { Image image = imageActor.GetImage(); @@ -360,20 +451,19 @@ public: Background* mBackground; ///< Only create the background if we use it Vector3* mStartingPinchScale; ///< The scale when a pinch gesture starts, TODO: consider removing this Toolkit::Control::KeyEventSignalType mKeyEventSignal; + Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusGainedSignal; + Toolkit::Control::KeyInputFocusSignalType mKeyInputFocusLostSignal; // Gesture Detection PinchGestureDetector mPinchGestureDetector; PanGestureDetector mPanGestureDetector; TapGestureDetector mTapGestureDetector; LongPressGestureDetector mLongPressGestureDetector; - // @todo change all these to Vector2 when we have a chance to sanitize the public API as well - Vector3 mCurrentSize; ///< Stores the current control's size, this is the negotiated size - Vector3 mNaturalSize; ///< Stores the size set through the Actor's API. This is size the actor wants to be. Useful when reset to the initial size is needed. - ControlBehaviour mFlags :6; ///< Flags passed in from constructor. Need to increase this size when new enums are added + 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 mInitialized :1; + 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; @@ -391,7 +481,7 @@ PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "key-input-foc Toolkit::Control Control::New() { // Create the implementation, temporarily owned on stack - IntrusivePtr controlImpl = new Control( CONTROL_BEHAVIOUR_NONE ); + IntrusivePtr controlImpl = new Control( ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ); // Pass ownership to handle Toolkit::Control handle( *controlImpl ); @@ -408,101 +498,6 @@ Control::~Control() delete mImpl; } -Vector3 Control::GetNaturalSize() -{ - // could be overridden in derived classes. - return mImpl->mNaturalSize; -} - -float Control::CalculateChildSize( const Dali::Actor& child, Dimension dimension ) -{ - // Could be overridden in derived classes. - return CalculateChildSizeBase( child, dimension ); -} - -bool Control::RelayoutDependentOnChildren( Dimension dimension ) -{ - return RelayoutDependentOnChildrenBase( dimension ); -} - -float Control::GetHeightForWidth( float width ) -{ - // could be overridden in derived classes. - float height( 0.0f ); - if ( mImpl->mNaturalSize.width > 0.0f ) - { - height = mImpl->mNaturalSize.height * width / mImpl->mNaturalSize.width; - } - return height; -} - -float Control::GetWidthForHeight( float height ) -{ - // could be overridden in derived classes. - float width( 0.0f ); - if ( mImpl->mNaturalSize.height > 0.0f ) - { - width = mImpl->mNaturalSize.width * height / mImpl->mNaturalSize.height; - } - return width; -} - -const Vector3& Control::GetControlSize() const -{ - return mImpl->mCurrentSize; -} - -const Vector3& Control::GetSizeSet() const -{ - return mImpl->mNaturalSize; -} - -void Control::SetKeyInputFocus() -{ - if( Self().OnStage() ) - { - Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); - } -} - -bool Control::HasKeyInputFocus() -{ - bool result = false; - if( Self().OnStage() ) - { - result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self())); - } - return result; -} - -void Control::ClearKeyInputFocus() -{ - if( Self().OnStage() ) - { - Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); - } -} - -PinchGestureDetector Control::GetPinchGestureDetector() const -{ - return mImpl->mPinchGestureDetector; -} - -PanGestureDetector Control::GetPanGestureDetector() const -{ - return mImpl->mPanGestureDetector; -} - -TapGestureDetector Control::GetTapGestureDetector() const -{ - return mImpl->mTapGestureDetector; -} - -LongPressGestureDetector Control::GetLongPressGestureDetector() const -{ - return mImpl->mLongPressGestureDetector; -} - void Control::SetStyleName( const std::string& styleName ) { if( styleName != mImpl->mStyleName ) @@ -534,11 +529,14 @@ void Control::SetBackgroundColor( const Vector4& color ) // Create Mesh Actor MeshActor meshActor = MeshActor::New( CreateMesh() ); - SetupBackgroundActor( meshActor, Actor::Property::SCALE, color ); + 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 ); + // Set the flag to avoid notifying children + mImpl->mAddRemoveBackgroundChild = true; + // use insert to guarantee its the first child (so that OVERLAY mode works) + Self().Insert( 0, meshActor ); + mImpl->mAddRemoveBackgroundChild = false; } background.color = color; @@ -559,17 +557,22 @@ void Control::SetBackgroundImage( Image image ) if ( background.actor ) { - // Remove Current actor, unset AFTER removal so that we do not inform deriving classes + // Remove Current actor, unset AFTER removal + mImpl->mAddRemoveBackgroundChild = true; Self().Remove( background.actor ); + mImpl->mAddRemoveBackgroundChild = false; background.actor.Reset(); } ImageActor imageActor = ImageActor::New( image ); - SetupBackgroundActor( imageActor, Actor::Property::SIZE, background.color ); + SetupBackgroundActor( imageActor, background.color ); // Set the background actor before adding so that we do not inform derived classes background.actor = imageActor; - Self().Add( imageActor ); + mImpl->mAddRemoveBackgroundChild = true; + // use insert to guarantee its the first child (so that OVERLAY mode works) + Self().Insert( 0, imageActor ); + mImpl->mAddRemoveBackgroundChild = false; } void Control::ClearBackground() @@ -577,21 +580,91 @@ 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 Control::GetBackgroundActor() const +void Control::EnableGestureDetection(Gesture::Type type) { - if ( mImpl->mBackground ) + 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 ) { - return mImpl->mBackground->actor; + mImpl->mPanGestureDetector = PanGestureDetector::New(); + mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); + mImpl->mPanGestureDetector.Attach(Self()); } - return Actor(); + 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()); + } +} + +void Control::DisableGestureDetection(Gesture::Type type) +{ + if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) + { + mImpl->mPinchGestureDetector.Detach(Self()); + mImpl->mPinchGestureDetector.Reset(); + } + + 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(); + } + + if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) + { + mImpl->mLongPressGestureDetector.Detach(Self()); + mImpl->mLongPressGestureDetector.Reset(); + } +} + +PinchGestureDetector Control::GetPinchGestureDetector() const +{ + return mImpl->mPinchGestureDetector; +} + +PanGestureDetector Control::GetPanGestureDetector() const +{ + return mImpl->mPanGestureDetector; +} + +TapGestureDetector Control::GetTapGestureDetector() const +{ + return mImpl->mTapGestureDetector; +} + +LongPressGestureDetector Control::GetLongPressGestureDetector() const +{ + return mImpl->mLongPressGestureDetector; } void Control::SetKeyboardNavigationSupport(bool isSupported) @@ -604,25 +677,30 @@ bool Control::IsKeyboardNavigationSupported() return mImpl->mIsKeyboardNavigationSupported; } -void Control::Activate() -{ - // Inform deriving classes - OnActivated(); -} - -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) @@ -638,74 +716,39 @@ 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) +bool Control::OnAccessibilityActivated() { + return false; // Accessibility activation is not handled by default } -bool Control::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) +bool Control::OnAccessibilityPan(PanGesture gesture) { - bool ret = false; - - if( object && ( 0 == strcmp( actionName.c_str(), ACTION_CONTROL_ACTIVATED ) ) ) - { - Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) ); - if( control ) - { - // if cast succeeds there is an implementation so no need to check - control.GetImplementation().OnActivated(); - } - } + return false; // Accessibility pan gesture is not handled by default +} - return ret; +bool Control::OnAccessibilityTouch(const TouchEvent& touchEvent) +{ + return false; // Accessibility touch event is not handled by default } -bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) +bool Control::OnAccessibilityValueChange(bool isIncrease) { - Dali::BaseHandle handle( object ); + return false; // Accessibility value change action is not handled by default +} - bool connected( false ); - Toolkit::Control control = Toolkit::Control::DownCast( handle ); - if ( control ) - { - Control& controlImpl( control.GetImplementation() ); - connected = true; +Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocus::Direction direction, bool loopEnabled) +{ + return Actor(); +} - if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) - { - controlImpl.KeyEventSignal().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 ); - } - else - { - // signalName does not match any signal - connected = false; - } - } - return connected; +void Control::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor) +{ } Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() @@ -713,6 +756,16 @@ Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal() return mImpl->mKeyEventSignal; } +Toolkit::Control::KeyInputFocusSignalType& Control:: KeyInputFocusGainedSignal() +{ + return mImpl->mKeyInputFocusGainedSignal; +} + +Toolkit::Control::KeyInputFocusSignalType& Control:: KeyInputFocusLostSignal() +{ + return mImpl->mKeyInputFocusLostSignal; +} + bool Control::EmitKeyEventSignal( const KeyEvent& event ) { // Guard against destruction during signal emission @@ -736,7 +789,7 @@ bool Control::EmitKeyEventSignal( const KeyEvent& event ) } Control::Control( ControlBehaviour behaviourFlags ) -: CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ), +: CustomActorImpl( static_cast< ActorFlags >( behaviourFlags ) ), mImpl(new Impl(*this)) { mImpl->mFlags = behaviourFlags; @@ -744,16 +797,6 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { - // Calling deriving classes - OnInitialize(); - - // Test if the no size negotiation flag is not set - if( ( mImpl->mFlags & NO_SIZE_NEGOTIATION ) == 0 ) - { - // Size negotiate disabled by default, so turn it on for this actor - Self().SetRelayoutEnabled( true ); - } - if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); @@ -765,82 +808,31 @@ void Control::Initialize() GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } - SetRequiresHoverEvents(mImpl->mFlags & REQUIRES_HOVER_EVENTS); - SetRequiresMouseWheelEvents(mImpl->mFlags & REQUIRES_MOUSE_WHEEL_EVENTS); - - mImpl->mInitialized = true; -} - -void Control::EnableGestureDetection(Gesture::Type type) -{ - if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) + if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) { - mImpl->mPinchGestureDetector = PinchGestureDetector::New(); - mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); - mImpl->mPinchGestureDetector.Attach(Self()); + SetKeyboardNavigationSupport( true ); } - if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) - { - mImpl->mPanGestureDetector = PanGestureDetector::New(); - mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); - mImpl->mPanGestureDetector.Attach(Self()); - } - - 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()); - } + // Calling deriving classes + OnInitialize(); } -void Control::DisableGestureDetection(Gesture::Type type) +void Control::OnInitialize() { - if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) - { - mImpl->mPinchGestureDetector.Detach(Self()); - mImpl->mPinchGestureDetector.Reset(); - } - - 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(); - } - - if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) - { - mImpl->mLongPressGestureDetector.Detach(Self()); - mImpl->mLongPressGestureDetector.Reset(); - } } -void Control::OnInitialize() +void Control::OnControlChildAdd( Actor& child ) { } -void Control::OnActivated() +void Control::OnControlChildRemove( Actor& child ) { } -void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change ) +void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) { // By default the control is only interested in theme (not font) changes - if( change.themeChange ) + if( change == StyleChange::THEME_CHANGE ) { GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } @@ -874,59 +866,78 @@ void Control::OnLongPress( const LongPressGesture& longPress ) { } -void Control::OnControlStageConnection() -{ -} - -void Control::OnControlStageDisconnection() +void Control::EmitKeyInputFocusSignal( bool focusGained ) { -} + Dali::Toolkit::Control handle( GetOwner() ); -void Control::OnControlChildAdd( Actor& child ) -{ + if ( focusGained ) + { + // signals are allocated dynamically when someone connects + if ( !mImpl->mKeyInputFocusGainedSignal.Empty() ) + { + mImpl->mKeyInputFocusGainedSignal.Emit( handle ); + } + } + else + { + // signals are allocated dynamically when someone connects + if ( !mImpl->mKeyInputFocusLostSignal.Empty() ) + { + mImpl->mKeyInputFocusLostSignal.Emit( handle ); + } + } } -void Control::OnControlChildRemove( Actor& child ) +void Control::OnStageConnection() { } -void Control::OnControlSizeSet( const Vector3& size ) +void Control::OnStageDisconnection() { } -void Control::OnCalculateRelayoutSize( Dimension dimension ) +void Control::OnKeyInputFocusGained() { + EmitKeyInputFocusSignal( true ); } -void Control::OnLayoutNegotiated( float size, Dimension dimension ) +void Control::OnKeyInputFocusLost() { + EmitKeyInputFocusSignal( false ); } -void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) +void Control::OnChildAdd(Actor& child) { - for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) + // If this is the background actor, then we do not want to inform deriving classes + if ( mImpl->mAddRemoveBackgroundChild ) { - container.Add( Self().GetChildAt( i ), size ); + return; } -} -void Control::OnSetResizePolicy( ResizePolicy policy, Dimension dimension ) -{ + // Notify derived classes. + OnControlChildAdd( child ); } -void Control::OnKeyInputFocusGained() +void Control::OnChildRemove(Actor& child) { - // Do Nothing + // 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::OnKeyInputFocusLost() +void Control::OnSizeSet(const Vector3& targetSize) { - // Do Nothing + // Background is resized through size negotiation } void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize) { - // @todo consider animating negotiated child sizes to target size + // @todo size negotiate background to new size, animate as well? } bool Control::OnTouchEvent(const TouchEvent& event) @@ -944,63 +955,78 @@ 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 } -void Control::OnStageConnection() +void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) { - // Notify derived classes. - OnControlStageConnection(); + for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) + { + container.Add( Self().GetChildAt( i ), size ); + } } -void Control::OnStageDisconnection() +void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) { - // Notify derived classes - OnControlStageDisconnection(); } -void Control::OnChildAdd(Actor& child) +Vector3 Control::GetNaturalSize() { - // If this is the background actor, then we do not want to relayout or inform deriving classes - if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) + if( mImpl->mBackground ) { - return; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetNaturalSize(); + } } + return Vector3(); +} - // Notify derived classes. - OnControlChildAdd( child ); +float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) +{ + return CalculateChildSizeBase( child, dimension ); } -void Control::OnChildRemove(Actor& child) +float Control::GetHeightForWidth( float width ) { - // If this is the background actor, then we do not want to relayout or inform deriving classes - if ( mImpl->mBackground && ( child == mImpl->mBackground->actor ) ) + if( mImpl->mBackground ) { - return; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetHeightForWidth( width ); + } } - - // Notify derived classes. - OnControlChildRemove( child ); + return GetHeightForWidthBase( width ); } -void Control::OnSizeSet(const Vector3& targetSize) +float Control::GetWidthForHeight( float height ) { - if( targetSize != mImpl->mNaturalSize ) + if( mImpl->mBackground ) { - // Only updates size if set through Actor's API - mImpl->mNaturalSize = targetSize; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetWidthForHeight( height ); + } } + return GetWidthForHeightBase( height ); +} - if( targetSize != mImpl->mCurrentSize ) - { - // Update control size. - mImpl->mCurrentSize = targetSize; +bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) +{ + return RelayoutDependentOnChildrenBase( dimension ); +} - // Notify derived classes. - OnControlSizeSet( targetSize ); - } +void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) +{ +} + +void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) +{ } void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) @@ -1013,6 +1039,22 @@ void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* call mImpl->SignalDisconnected( slotObserver, callback ); } +Control& GetImplementation( Dali::Toolkit::Control& handle ) +{ + CustomActorImpl& customInterface = handle.GetImplementation(); + // downcast to control + Control& impl = dynamic_cast< Internal::Control& >( customInterface ); + return impl; +} + +const Control& GetImplementation( const Dali::Toolkit::Control& handle ) +{ + const CustomActorImpl& customInterface = handle.GetImplementation(); + // downcast to control + const Control& impl = dynamic_cast< const Internal::Control& >( customInterface ); + return impl; +} + } // namespace Internal } // namespace Toolkit