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=17161d016045e70e2cf4ebb0cb59a9ed9b3fc9b5;hb=73d239b4c5c2c4a558cbaf44bdcc744c8f497c14;hpb=5f6165d99752951091d9b2269f3db25c4be3239d diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 17161d0..cd4301d 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() @@ -65,17 +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, "key-input-focus-gained", SIGNAL_KEY_INPUT_FOCUS_GAINED ) -DALI_SIGNAL_REGISTRATION( Control, "key-input-focus-lost", SIGNAL_KEY_INPUT_FOCUS_LOST ) -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() @@ -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,8 +178,6 @@ public: mPanGestureDetector(), mTapGestureDetector(), mLongPressGestureDetector(), - mCurrentSize(), - mNaturalSize(), mFlags( Control::ControlBehaviour( ACTOR_BEHAVIOUR_NONE ) ), mIsKeyboardNavigationSupported( false ), mIsKeyboardFocusGroup( false ), @@ -390,9 +372,6 @@ 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. @@ -434,51 +413,41 @@ Control::~Control() 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 ); + if( mImpl->mBackground ) + { + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetNaturalSize(); + } + } + return Vector3(); } float Control::GetHeightForWidth( float width ) { - // could be overridden in derived classes. - float height( 0.0f ); - if ( mImpl->mNaturalSize.width > 0.0f ) + if( mImpl->mBackground ) { - height = mImpl->mNaturalSize.height * width / mImpl->mNaturalSize.width; + Actor actor = mImpl->mBackground->actor; + if( actor ) + { + return actor.GetHeightForWidth( 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() @@ -874,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() ) ); } @@ -951,6 +920,16 @@ void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dime { } +float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) +{ + return CalculateChildSizeBase( child, dimension ); +} + +bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) +{ + return RelayoutDependentOnChildrenBase( dimension ); +} + void Control::EmitKeyInputFocusSignal( bool focusGained ) { Dali::Toolkit::Control handle( GetOwner() ); @@ -1046,20 +1025,10 @@ void Control::OnChildRemove(Actor& child) void Control::OnSizeSet(const Vector3& targetSize) { - if( targetSize != mImpl->mNaturalSize ) - { - // Only updates size if set through Actor's API - mImpl->mNaturalSize = targetSize; - } - - if( targetSize != mImpl->mCurrentSize ) - { - // Update control size. - mImpl->mCurrentSize = targetSize; + // Background is resized through size negotiation - // Notify derived classes. - OnControlSizeSet( targetSize ); - } + // Notify derived classes. + OnControlSizeSet( targetSize ); } void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )