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=cd4301d4a19912a657596e22afde9473ac45c7e2;hp=21b2a4dca3dde1b62f9e2747d5c3f5090af903b0;hb=73d239b4c5c2c4a558cbaf44bdcc744c8f497c14;hpb=a3390cb9c1cd0aeddbcd4aa89d6045592a123dd3 diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 21b2a4d..cd4301d 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,25 +19,25 @@ #include // EXTERNAL INCLUDES +#include // for strcmp +#include #include #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 namespace Dali @@ -49,22 +49,6 @@ namespace Toolkit namespace { -const Scripting::StringEnum< Control::SizePolicy > SIZE_POLICY_STRING_TABLE[] = -{ - { "FIXED", Control::Fixed }, - { "MINIMUM", Control::Minimum }, - { "MAXIMUM", Control::Maximum }, - { "RANGE", Control::Range }, - { "FLEXIBLE", Control::Flexible }, -}; -const unsigned int SIZE_POLICY_STRING_TABLE_COUNT = sizeof( SIZE_POLICY_STRING_TABLE ) / sizeof( SIZE_POLICY_STRING_TABLE[0] ); - -#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 ); BaseHandle Create() @@ -75,15 +59,17 @@ BaseHandle Create() // 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 ) +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( Control, "control-activated", ACTION_CONTROL_ACTIVATED ) +DALI_ACTION_REGISTRATION( Toolkit, Control, "control-activated", ACTION_CONTROL_ACTIVATED ) DALI_TYPE_REGISTRATION_END() @@ -106,70 +92,6 @@ struct Background }; /** - * Helper function to calculate a dimension given the policy of that dimension; the minimum & - * maximum values that dimension can be; and the allocated value for that dimension. - * - * @param[in] policy The size policy for that dimension. - * @param[in] minimum The minimum value that dimension can be. - * @param[in] maximum The maximum value that dimension can be. - * @param[in] allocated The value allocated for that dimension. - * - * @return The value that the dimension should be. - * - * @note This does not handle Control::Fixed policy. - */ -float Calculate( Control::SizePolicy policy, float minimum, float maximum, float allocated ) -{ - float size( allocated ); - - switch( policy ) - { - case Control::Fixed: - { - // Use allocated value - break; - } - - case Control::Minimum: - { - // Size is always at least the minimum. - size = std::max( allocated, minimum ); - break; - } - - case Control::Maximum: - { - // Size can grow but up to a maximum value. - size = std::min( allocated, maximum ); - break; - } - - case Control::Range: - { - // Size is at least the minimum and can grow up to the maximum - size = std::max( size, minimum ); - size = std::min( size, maximum ); - break; - } - - case Control::Flexible: - { - // Size grows or shrinks with no limits. - size = allocated; - break; - } - - default: - { - DALI_ASSERT_DEBUG( false && "This function was not intended to be used by any other policy." ); - break; - } - } - - return size; -} - -/** * Creates a white coloured Mesh. */ Mesh CreateMesh() @@ -204,20 +126,36 @@ 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.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 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 ); - Constraint constraint = Constraint::New( constrainingIndex, - ParentSource( Actor::Property::SIZE ), + Constraint constraint = Constraint::New( actor, + constrainingIndex, EqualToConstraint() ); - actor.ApplyConstraint( constraint ); + constraint.AddSource( ParentSource( Actor::Property::SIZE ) ); + constraint.Apply(); } } // unnamed namespace @@ -229,19 +167,10 @@ 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 ), + mStyleName(""), mBackground( NULL ), mStartingPinchScale( NULL ), mKeyEventSignal(), @@ -249,12 +178,7 @@ public: mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), - mWidthPolicy( Toolkit::Control::Fixed ), - mHeightPolicy( Toolkit::Control::Fixed ), - mFlags( Control::CONTROL_BEHAVIOUR_NONE ), - mInsideRelayout( false ), + mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), mIsKeyboardFocusGroup( false ), mInitialized( false ) @@ -323,13 +247,19 @@ public: switch ( index ) { + case Toolkit::Control::Property::STYLE_NAME: + { + controlImpl.SetStyleName( value.Get< std::string >() ); + break; + } + case Toolkit::Control::Property::BACKGROUND_COLOR: { controlImpl.SetBackgroundColor( value.Get< Vector4 >() ); break; } - case Toolkit::Control::Property::BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_IMAGE: { if ( value.HasKey( "image" ) ) { @@ -338,7 +268,7 @@ public: if ( image ) { - controlImpl.SetBackground( image ); + controlImpl.SetBackgroundImage( image ); } } else if ( value.Get< Property::Map >().Empty() ) @@ -349,30 +279,6 @@ public: break; } - case Toolkit::Control::Property::WIDTH_POLICY: - { - controlImpl.mImpl->mWidthPolicy = Scripting::GetEnumeration< Toolkit::Control::SizePolicy >( value.Get< std::string >().c_str(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ); - break; - } - - case Toolkit::Control::Property::HEIGHT_POLICY: - { - controlImpl.mImpl->mHeightPolicy = Scripting::GetEnumeration< Toolkit::Control::SizePolicy >( value.Get< std::string >().c_str(), SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ); - break; - } - - case Toolkit::Control::Property::MINIMUM_SIZE: - { - controlImpl.SetMinimumSize( value.Get< Vector3 >() ); - break; - } - - case Toolkit::Control::Property::MAXIMUM_SIZE: - { - controlImpl.SetMaximumSize( value.Get< Vector3 >() ); - break; - } - case Toolkit::Control::Property::KEY_INPUT_FOCUS: { if ( value.Get< bool >() ) @@ -407,13 +313,19 @@ public: switch ( index ) { + case Toolkit::Control::Property::STYLE_NAME: + { + value = controlImpl.GetStyleName(); + break; + } + case Toolkit::Control::Property::BACKGROUND_COLOR: { value = controlImpl.GetBackgroundColor(); break; } - case Toolkit::Control::Property::BACKGROUND: + case Toolkit::Control::Property::BACKGROUND_IMAGE: { Property::Map map; @@ -434,30 +346,6 @@ public: break; } - case Toolkit::Control::Property::WIDTH_POLICY: - { - value = std::string( Scripting::GetEnumerationName< Toolkit::Control::SizePolicy >( controlImpl.mImpl->mWidthPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) ); - break; - } - - case Toolkit::Control::Property::HEIGHT_POLICY: - { - value = std::string( Scripting::GetEnumerationName< Toolkit::Control::SizePolicy >( controlImpl.mImpl->mHeightPolicy, SIZE_POLICY_STRING_TABLE, SIZE_POLICY_STRING_TABLE_COUNT ) ); - break; - } - - case Toolkit::Control::Property::MINIMUM_SIZE: - { - value = controlImpl.mImpl->GetMinimumSize(); - break; - } - - case Toolkit::Control::Property::MAXIMUM_SIZE: - { - value = controlImpl.mImpl->GetMaximumSize(); - break; - } - case Toolkit::Control::Property::KEY_INPUT_FOCUS: { value = controlImpl.HasKeyInputFocus(); @@ -469,127 +357,44 @@ public: return value; } - /** - * Helper to get minimum size - * @return minimum size - */ - inline const Vector3& GetMinimumSize() - { - if( mMinMaxSize.Count() > MIN_SIZE_INDEX ) - { - return mMinMaxSize[ MIN_SIZE_INDEX ]; - } - else - { - // its not been allocated so its ZERO - return Vector3::ZERO; - } - } - /** - * Helper to Set minimum size - * @param size to set - */ - inline void SetMinimumSize( const Vector3& size ) - { - if( mMinMaxSize.Count() > MIN_SIZE_INDEX ) - { - mMinMaxSize[ MIN_SIZE_INDEX ] = size; - } - else - { - // its not been allocated so push the new value there - mMinMaxSize.PushBack( size ); - } - } - - /** - * Helper to get maximum size - * @return maximum size - */ - inline const Vector3& GetMaximumSize() - { - if( mMinMaxSize.Count() > MAX_SIZE_INDEX ) - { - return mMinMaxSize[ MAX_SIZE_INDEX ]; - } - else - { - // its not been allocated so its MAX_SIZE - return MAX_SIZE; - } - } - - /** - * Helper to Set minimum size - * @param size to set - */ - inline void SetMaximumSize( const Vector3& size ) - { - if( mMinMaxSize.Count() > MAX_SIZE_INDEX ) - { - mMinMaxSize[ MAX_SIZE_INDEX ] = size; - } - else if( mMinMaxSize.Count() > MIN_SIZE_INDEX ) - { - // max has not been allocated, but min has - mMinMaxSize.PushBack( size ); - } - else - { - // min and max both unallocated so allocate both - mMinMaxSize.Resize( 2u ); // this will reserve and default construct two Vector3s - mMinMaxSize[ MAX_SIZE_INDEX ] = size; - } - } - // Data Control& mControlImpl; + std::string mStyleName; 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. - Dali::Vector< Vector3 > mMinMaxSize; ///< Stores the minimum and maximum size if they are set - - Toolkit::Control::SizePolicy mWidthPolicy :3; ///< Stores the width policy. 3 bits covers 8 values - Toolkit::Control::SizePolicy mHeightPolicy :3; ///< Stores the height policy. 3 bits covers 8 values - ControlBehaviour mFlags :6; ///< Flags passed in from constructor. Need to increase this size when new enums are added - bool mInsideRelayout:1; ///< Detect when were in Relayout - 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; + + 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; // 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 PropertyRegistration PROPERTY_5; - static PropertyRegistration PROPERTY_6; - static PropertyRegistration PROPERTY_7; }; // Properties registered without macro to use specific member variables. -PropertyRegistration Control::Impl::PROPERTY_1( typeRegistration, "background-color", Toolkit::Control::Property::BACKGROUND_COLOR, Property::VECTOR4, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_2( typeRegistration, "background", Toolkit::Control::Property::BACKGROUND, Property::MAP, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_3( typeRegistration, "width-policy", Toolkit::Control::Property::WIDTH_POLICY, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_4( typeRegistration, "height-policy", Toolkit::Control::Property::HEIGHT_POLICY, Property::STRING, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_5( typeRegistration, "minimum-size", Toolkit::Control::Property::MINIMUM_SIZE, Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_6( typeRegistration, "maximum-size", Toolkit::Control::Property::MAXIMUM_SIZE, Property::VECTOR3, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); -PropertyRegistration Control::Impl::PROPERTY_7( typeRegistration, "key-input-focus", Toolkit::Control::Property::KEY_INPUT_FOCUS, Property::BOOLEAN, &Control::Impl::SetProperty, &Control::Impl::GetProperty ); +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 ); 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 ); @@ -606,111 +411,43 @@ Control::~Control() delete mImpl; } -void Control::SetSizePolicy( Toolkit::Control::SizePolicy widthPolicy, Toolkit::Control::SizePolicy heightPolicy ) -{ - bool relayoutRequest( false ); - - if ( ( mImpl->mWidthPolicy != widthPolicy ) || ( mImpl->mHeightPolicy != heightPolicy ) ) - { - relayoutRequest = true; - } - - mImpl->mWidthPolicy = widthPolicy; - mImpl->mHeightPolicy = heightPolicy; - - // Ensure RelayoutRequest is called AFTER new policies have been set. - if ( relayoutRequest ) - { - RelayoutRequest(); - } -} - -void Control::GetSizePolicy( Toolkit::Control::SizePolicy& widthPolicy, Toolkit::Control::SizePolicy& heightPolicy ) const -{ - widthPolicy = mImpl->mWidthPolicy; - heightPolicy = mImpl->mHeightPolicy; -} - -void Control::SetMinimumSize( const Vector3& size ) +Vector3 Control::GetNaturalSize() { - const Vector3& minSize = mImpl->GetMinimumSize(); - if ( fabsf( minSize.width - size.width ) > Math::MACHINE_EPSILON_1000 || - fabsf( minSize.height - size.height ) > Math::MACHINE_EPSILON_1000 ) + if( mImpl->mBackground ) { - mImpl->SetMinimumSize( size ); - - // Only relayout if our control is using the minimum or range policy. - if ( ( mImpl->mHeightPolicy == Toolkit::Control::Minimum ) || ( mImpl->mWidthPolicy == Toolkit::Control::Minimum ) || - ( mImpl->mHeightPolicy == Toolkit::Control::Range ) || ( mImpl->mWidthPolicy == Toolkit::Control::Range ) ) + Actor actor = mImpl->mBackground->actor; + if( actor ) { - RelayoutRequest(); + return actor.GetNaturalSize(); } } + return Vector3(); } -const Vector3& Control::GetMinimumSize() const -{ - return mImpl->GetMinimumSize(); -} - -void Control::SetMaximumSize( const Vector3& size ) +float Control::GetHeightForWidth( float width ) { - const Vector3& maxSize = mImpl->GetMaximumSize(); - if ( fabsf( maxSize.width - size.width ) > Math::MACHINE_EPSILON_1000 || - fabsf( maxSize.height - size.height ) > Math::MACHINE_EPSILON_1000 ) + if( mImpl->mBackground ) { - mImpl->SetMaximumSize( size ); - - // Only relayout if our control is using the maximum or range policy. - if ( ( mImpl->mHeightPolicy == Toolkit::Control::Maximum ) || ( mImpl->mWidthPolicy == Toolkit::Control::Maximum ) || - ( mImpl->mHeightPolicy == Toolkit::Control::Range ) || ( mImpl->mWidthPolicy == Toolkit::Control::Range ) ) + Actor actor = mImpl->mBackground->actor; + if( actor ) { - RelayoutRequest(); + return actor.GetHeightForWidth( width ); } } -} - -const Vector3& Control::GetMaximumSize() const -{ - return mImpl->GetMaximumSize(); -} - -Vector3 Control::GetNaturalSize() -{ - // could be overridden in derived classes. - return mImpl->mNaturalSize; -} - -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; + return GetHeightForWidthBase( width ); } float Control::GetWidthForHeight( float height ) { - // could be overridden in derived classes. - float width( 0.0f ); - if ( mImpl->mNaturalSize.height > 0.0f ) + if( mImpl->mBackground ) { - width = mImpl->mNaturalSize.width * height / mImpl->mNaturalSize.height; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetWidthForHeight( height ); + } } - return width; -} - -const Vector3& Control::GetControlSize() const -{ - return mImpl->mCurrentSize; -} - -const Vector3& Control::GetSizeSet() const -{ - return mImpl->mNaturalSize; + return GetWidthForHeightBase( height ); } void Control::SetKeyInputFocus() @@ -759,6 +496,23 @@ LongPressGestureDetector Control::GetLongPressGestureDetector() const return mImpl->mLongPressGestureDetector; } +void Control::SetStyleName( const std::string& styleName ) +{ + if( styleName != mImpl->mStyleName ) + { + mImpl->mStyleName = styleName; + + // Apply new style + Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); + GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + } +} + +const std::string& Control::GetStyleName() const +{ + return mImpl->mStyleName; +} + void Control::SetBackgroundColor( const Vector4& color ) { Background& background( mImpl->GetBackground() ); @@ -773,7 +527,7 @@ 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; @@ -792,7 +546,7 @@ Vector4 Control::GetBackgroundColor() const return Color::TRANSPARENT; } -void Control::SetBackground( Image image ) +void Control::SetBackgroundImage( Image image ) { Background& background( mImpl->GetBackground() ); @@ -804,7 +558,7 @@ void Control::SetBackground( Image image ) } 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; @@ -864,116 +618,6 @@ bool Control::OnAccessibilityValueChange(bool isIncrease) return false; // Accessibility value change action is not handled by default } -void Control::NegotiateSize( const Vector2& allocatedSize, ActorSizeContainer& container ) -{ - Vector2 size; - - if ( mImpl->mWidthPolicy == Toolkit::Control::Fixed ) - { - if ( mImpl->mHeightPolicy == Toolkit::Control::Fixed ) - { - // If a control says it has a fixed size, then use the size set by the application / control. - Vector2 setSize( mImpl->mNaturalSize ); - if ( setSize != Vector2::ZERO ) - { - size = setSize; - - // Policy is set to Fixed, so if the application / control has not set one of the dimensions, - // then we should use the natural size of the control rather than the full allocation. - if ( EqualsZero( size.width ) ) - { - size.width = GetWidthForHeight( size.height ); - } - else if ( EqualsZero( size.height ) ) - { - size.height = GetHeightForWidth( size.width ); - } - } - else - { - // If that is not set then set the size to the control's natural size - size = Vector2( GetNaturalSize() ); - } - } - else - { - // Width is fixed so if the application / control has set it, then use that. - if ( !EqualsZero( mImpl->mNaturalSize.width ) ) - { - size.width = mImpl->mNaturalSize.width; - } - else - { - // Otherwise, set the width to what has been allocated. - size.width = allocatedSize.width; - } - - // Height is flexible so ask control what the height should be for our width. - size.height = GetHeightForWidth( size.width ); - - // Ensure height is within our policy rules - size.height = Calculate( mImpl->mHeightPolicy, GetMinimumSize().height, GetMaximumSize().height, size.height ); - } - } - else - { - if ( mImpl->mHeightPolicy == Toolkit::Control::Fixed ) - { - // Height is fixed so if the application / control has set it, then use that. - if ( !EqualsZero( mImpl->mNaturalSize.height ) ) - { - size.height = mImpl->mNaturalSize.height; - } - else - { - // Otherwise, set the height to what has been allocated. - size.height = allocatedSize.height; - } - - // Width is flexible so ask control what the width should be for our height. - size.width = GetWidthForHeight( size.height ); - - // Ensure width is within our policy rules - size.width = Calculate( mImpl->mWidthPolicy, mImpl->GetMinimumSize().width, mImpl->GetMaximumSize().width, size.width ); - } - else - { - // Width and height are BOTH flexible. - // Calculate the width and height using the policy rules. - size.width = Calculate( mImpl->mWidthPolicy, mImpl->GetMinimumSize().width, mImpl->GetMaximumSize().width, allocatedSize.width ); - size.height = Calculate( mImpl->mHeightPolicy, mImpl->GetMinimumSize().height, mImpl->GetMaximumSize().height, allocatedSize.height ); - } - } - - // If the width has not been set, then set to the allocated width. - // Also if the width set is greater than the allocated, then set to allocated (no exceed support). - if ( EqualsZero( size.width ) || ( size.width > allocatedSize.width ) ) - { - size.width = allocatedSize.width; - } - - // If the height has not been set, then set to the allocated height. - // Also if the height set is greater than the allocated, then set to allocated (no exceed support). - if ( EqualsZero( size.height ) || ( size.height > allocatedSize.height ) ) - { - size.height = allocatedSize.height; - } - - DALI_LOG_INFO( gLogFilter, Debug::Verbose, - "%p: Natural: [%.2f, %.2f] Allocated: [%.2f, %.2f] Set: [%.2f, %.2f]\n", - Self().GetObjectPtr(), - GetNaturalSize().x, GetNaturalSize().y, - allocatedSize.x, allocatedSize.y, - size.x, size.y ); - - // Avoids relayout again when OnSizeSet callback arrives as a function of us or deriving class calling SetSize() - mImpl->mInsideRelayout = true; - Self().SetSize( size ); - // Only relayout controls which requested to be relaid out. - OnRelayout( size, container ); - mImpl->mInsideRelayout = false; -} - void Control::SetAsKeyboardFocusGroup(bool isFocusGroup) { mImpl->mIsKeyboardFocusGroup = isFocusGroup; @@ -1028,6 +672,14 @@ bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* t { 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 ); @@ -1062,6 +714,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 @@ -1085,7 +747,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; @@ -1093,7 +755,6 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { - // Calling deriving classes OnInitialize(); @@ -1108,8 +769,10 @@ void Control::Initialize() GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); } - SetRequiresHoverEvents(mImpl->mFlags & REQUIRES_HOVER_EVENTS); - SetRequiresMouseWheelEvents(mImpl->mFlags & REQUIRES_MOUSE_WHEEL_EVENTS); + if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) + { + SetKeyboardNavigationSupport( true ); + } mImpl->mInitialized = true; } @@ -1172,32 +835,6 @@ void Control::DisableGestureDetection(Gesture::Type type) } } -void Control::RelayoutRequest() -{ - // unfortunate double negative but thats to guarantee new controls get size negotiation - // by default and have to "opt-out" if they dont want it - if( !(mImpl->mFlags & NO_SIZE_NEGOTIATION) ) - { - Internal::RelayoutController::Request(); - } -} - -void Control::Relayout( Actor actor, const Vector2& size, ActorSizeContainer& container ) -{ - if ( actor ) - { - Toolkit::Control control( Toolkit::Control::DownCast( actor ) ); - if( control ) - { - control.GetImplementation().NegotiateSize( size, container ); - } - else - { - container.push_back( ActorSizePair( actor, size ) ); - } - } -} - void Control::OnInitialize() { } @@ -1206,10 +843,10 @@ void Control::OnActivated() { } -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() ) ); } @@ -1263,24 +900,66 @@ void Control::OnControlSizeSet( const Vector3& size ) { } -void Control::OnRelayout( const Vector2& size, ActorSizeContainer& container ) +void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) +{ +} + +void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) { - unsigned int numChildren = Self().GetChildCount(); +} - for( unsigned int i=0; imKeyInputFocusGainedSignal.Empty() ) + { + mImpl->mKeyInputFocusGainedSignal.Emit( handle ); + } + } + else + { + // signals are allocated dynamically when someone connects + if ( !mImpl->mKeyInputFocusLostSignal.Empty() ) + { + mImpl->mKeyInputFocusLostSignal.Emit( handle ); + } } } void Control::OnKeyInputFocusGained() { - // Do Nothing + EmitKeyInputFocusSignal( true ); } void Control::OnKeyInputFocusLost() { - // Do Nothing + EmitKeyInputFocusSignal( false ); } void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize) @@ -1310,8 +989,6 @@ bool Control::OnMouseWheelEvent(const MouseWheelEvent& event) void Control::OnStageConnection() { - RelayoutRequest(); - // Notify derived classes. OnControlStageConnection(); } @@ -1330,9 +1007,6 @@ void Control::OnChildAdd(Actor& child) return; } - // Request for relayout as we may need to position the new child and old ones - RelayoutRequest(); - // Notify derived classes. OnControlChildAdd( child ); } @@ -1345,29 +1019,16 @@ void Control::OnChildRemove(Actor& child) return; } - // Request for relayout as we may need to re-position the old child - RelayoutRequest(); - // Notify derived classes. OnControlChildRemove( child ); } void Control::OnSizeSet(const Vector3& targetSize) { - if( ( !mImpl->mInsideRelayout ) && ( targetSize != mImpl->mNaturalSize ) ) - { - // Only updates size if set through Actor's API - mImpl->mNaturalSize = targetSize; - } + // Background is resized through size negotiation - if( targetSize != mImpl->mCurrentSize ) - { - // Update control size. - mImpl->mCurrentSize = targetSize; - - // Notify derived classes. - OnControlSizeSet( targetSize ); - } + // Notify derived classes. + OnControlSizeSet( targetSize ); } void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )