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=d655a3ba75c277d584b1921a62d8d82839a57285;hp=e825767317cda32fb89e6883f317440626532c31;hb=5eb13f530dc354efac87e7aeabfca52677967523;hpb=98d4ab61c23c9c7494f5936f7807b9c17075315f diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index e825767..d655a3b 100644 --- a/dali-toolkit/public-api/controls/control-impl.cpp +++ b/dali-toolkit/public-api/controls/control-impl.cpp @@ -23,13 +23,13 @@ #include #include #include -#include +#include #include #include -#include +#include #include -#include -#include +#include +#include #include #include @@ -37,7 +37,7 @@ #include #include #include -#include +#include #include namespace Dali @@ -49,12 +49,6 @@ 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 ); BaseHandle Create() @@ -173,16 +167,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 ), @@ -194,12 +178,9 @@ public: mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), - mIsKeyboardFocusGroup( false ), - mInitialized( false ) + mIsKeyboardFocusGroup( false ) { } @@ -261,7 +242,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -327,7 +308,7 @@ public: if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); switch ( index ) { @@ -347,10 +328,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(); @@ -390,14 +371,10 @@ public: 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 :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; @@ -432,55 +409,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::Type dimension ) -{ - // Could be overridden in derived classes. - return CalculateChildSizeBase( child, dimension ); -} - -bool Control::RelayoutDependentOnChildren( Dimension::Type 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() ) @@ -608,16 +536,6 @@ void Control::ClearBackground() } } -Actor Control::GetBackgroundActor() const -{ - if ( mImpl->mBackground ) - { - return mImpl->mBackground->actor; - } - - return Actor(); -} - void Control::SetKeyboardNavigationSupport(bool isSupported) { mImpl->mIsKeyboardNavigationSupported = isSupported; @@ -631,7 +549,11 @@ bool Control::IsKeyboardNavigationSupported() void Control::Activate() { // Inform deriving classes - OnActivated(); + OnAccessibilityActivated(); +} + +void Control::OnAccessibilityActivated() +{ } bool Control::OnAccessibilityPan(PanGesture gesture) @@ -681,7 +603,7 @@ bool Control::DoAction(BaseObject* object, const std::string& actionName, const if( control ) { // if cast succeeds there is an implementation so no need to check - control.GetImplementation().OnActivated(); + GetImplementation( control ).OnAccessibilityActivated(); } } @@ -696,7 +618,7 @@ bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* t Toolkit::Control control = Toolkit::Control::DownCast( handle ); if ( control ) { - Control& controlImpl( control.GetImplementation() ); + Control& controlImpl( GetImplementation( control ) ); connected = true; if ( 0 == strcmp( signalName.c_str(), SIGNAL_KEY_EVENT ) ) @@ -786,9 +708,6 @@ Control::Control( ControlBehaviour behaviourFlags ) void Control::Initialize() { - // Calling deriving classes - OnInitialize(); - if( mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS ) { Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); @@ -805,7 +724,8 @@ void Control::Initialize() SetKeyboardNavigationSupport( true ); } - mImpl->mInitialized = true; + // Calling deriving classes + OnInitialize(); } void Control::EnableGestureDetection(Gesture::Type type) @@ -870,14 +790,26 @@ void Control::OnInitialize() { } -void Control::OnActivated() +void Control::OnControlStageConnection() +{ +} + +void Control::OnControlStageDisconnection() +{ +} + +void Control::OnControlChildAdd( Actor& child ) +{ +} + +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() ) ); } @@ -911,46 +843,10 @@ void Control::OnLongPress( const LongPressGesture& longPress ) { } -void Control::OnControlStageConnection() -{ -} - -void Control::OnControlStageDisconnection() -{ -} - -void Control::OnControlChildAdd( Actor& child ) -{ -} - -void Control::OnControlChildRemove( Actor& child ) -{ -} - void Control::OnControlSizeSet( const Vector3& size ) { } -void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) -{ -} - -void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) -{ -} - -void Control::OnRelayout( const Vector2& size, RelayoutContainer& container ) -{ - for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i ) - { - container.Add( Self().GetChildAt( i ), size ); - } -} - -void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) -{ -} - void Control::EmitKeyInputFocusSignal( bool focusGained ) { Dali::Toolkit::Control handle( GetOwner() ); @@ -983,9 +879,53 @@ void Control::OnKeyInputFocusLost() EmitKeyInputFocusSignal( false ); } +void Control::OnStageConnection() +{ + // Notify derived classes. + OnControlStageConnection(); +} + +void Control::OnStageDisconnection() +{ + // Notify derived classes + OnControlStageDisconnection(); +} + +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 ); +} + 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) @@ -1008,58 +948,73 @@ bool Control::OnMouseWheelEvent(const MouseWheelEvent& 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 ) @@ -1072,6 +1027,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