-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+// CLASS HEADER
#include <dali-toolkit/public-api/controls/control-impl.h>
-#include <boost/thread/tss.hpp>
+// EXTERNAL INCLUDES
+#include <cstring> // for strcmp
+#include <limits>
#include <stack>
-
+#include <dali/public-api/actors/image-actor.h>
+#include <dali/public-api/actors/mesh-actor.h>
+#include <dali/public-api/animation/constraint.h>
+#include <dali/public-api/animation/constraints.h>
+#include <dali/public-api/geometry/mesh.h>
+#include <dali/public-api/object/type-registry.h>
+#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/scripting/scripting.h>
+#include <dali/public-api/size-negotiation/relayout-container.h>
#include <dali/integration-api/debug.h>
-#include "dali-toolkit/internal/controls/style-change-processor.h"
-#include "dali-toolkit/internal/controls/relayout-controller.h"
-#include "dali-toolkit/internal/controls/relayout-helper.h"
-#include "dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h"
-#include "dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h"
+// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/focus-manager/keyinput-focus-manager.h>
+#include <dali-toolkit/public-api/focus-manager/keyboard-focus-manager.h>
#include <dali-toolkit/public-api/controls/control.h>
+#include <dali-toolkit/public-api/styling/style-manager.h>
+#include <dali-toolkit/internal/styling/style-manager-impl.h>
namespace Dali
{
namespace Toolkit
{
-const Property::Index Control::PROPERTY_BACKGROUND_COLOR = ControlImpl::CONTROL_PROPERTY_START_INDEX;
-const Property::Index Control::PROPERTY_BACKGROUND = ControlImpl::CONTROL_PROPERTY_START_INDEX + 1;
-
namespace
{
#endif
const float MAX_FLOAT_VALUE( std::numeric_limits<float>::max() );
+const Vector3 MAX_SIZE( MAX_FLOAT_VALUE, MAX_FLOAT_VALUE, MAX_FLOAT_VALUE );
const float BACKGROUND_ACTOR_Z_POSITION( -0.1f );
BaseHandle Create()
{
- return ControlImpl::New();
+ return Internal::Control::New();
}
-TypeRegistration CONTROL_TYPE( typeid(Control), typeid(CustomActor), Create );
+// Setup signals and actions using the type-registry.
+DALI_TYPE_REGISTRATION_BEGIN( Control, CustomActor, Create );
-// Property Registration after ControlImpl::Impl definition below
+// Note: Properties are registered separately below,
-TypeAction ACTION_TYPE_1(CONTROL_TYPE, Toolkit::Control::ACTION_CONTROL_ACTIVATED, &ControlImpl::DoAction);
+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 )
-/**
- * Helper class used to set the Control's size through the Actor's API or through children added.
- */
-class SetSizeLock
-{
-public:
- SetSizeLock( bool& lock )
- : mLock( lock )
- {
- mLock = true;
- }
-
- ~SetSizeLock()
- {
- mLock = false;
- }
+DALI_ACTION_REGISTRATION( Control, "control-activated", ACTION_CONTROL_ACTIVATED )
-private:
- bool& mLock;
-};
+DALI_TYPE_REGISTRATION_END()
/**
* Structure which holds information about the background of a control
};
/**
- * 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()
{
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( false );
- Constraint constraint = Constraint::New<Vector3>( constrainingIndex,
- ParentSource( Actor::SIZE ),
+ Constraint constraint = Constraint::New<Vector3>( actor,
+ constrainingIndex,
EqualToConstraint() );
- actor.ApplyConstraint( constraint );
+ constraint.AddSource( ParentSource( Actor::Property::SIZE ) );
+ constraint.Apply();
}
} // unnamed namespace
-class ControlImpl::Impl : public ConnectionTrackerInterface
+namespace Internal
+{
+
+class Control::Impl : public ConnectionTracker
{
public:
+
+ /**
+ * Size indices for mMinMaxSize array
+ */
+ enum
+ {
+ MIN_SIZE_INDEX = 0,
+ MAX_SIZE_INDEX = 1
+ };
+
+public:
// Construction & Destruction
- Impl(ControlImpl& controlImpl)
- : mControlImpl(controlImpl),
- mInitialized( false ),
+ Impl(Control& controlImpl)
+ : mControlImpl( controlImpl ),
+ mStyleName(""),
+ mBackground( NULL ),
+ mStartingPinchScale( NULL ),
+ mKeyEventSignal(),
mPinchGestureDetector(),
mPanGestureDetector(),
mTapGestureDetector(),
mLongPressGestureDetector(),
- mStartingPinchScale(),
- mLockSetSize( false ),
- mWidthPolicy( Control::Fixed ),
- mHeightPolicy( Control::Fixed ),
- mSize(),
- mSetSize(),
- mMinimumSize(),
- mMaximumSize( MAX_FLOAT_VALUE, MAX_FLOAT_VALUE, MAX_FLOAT_VALUE ),
- mIsKeyboardNavigationSupported(false),
- mIsKeyboardFocusGroup(false),
- mKeyEventSignalV2(),
- mBackground( NULL )
+ mCurrentSize(),
+ mNaturalSize(),
+ mFlags( Control::CONTROL_BEHAVIOUR_NONE ),
+ mIsKeyboardNavigationSupported( false ),
+ mIsKeyboardFocusGroup( false ),
+ mInitialized( false )
{
}
~Impl()
{
// All gesture detectors will be destroyed so no need to disconnect.
- if ( mBackground )
- {
- delete mBackground;
- }
+ delete mBackground;
+ delete mStartingPinchScale;
}
// Gesture Detection Methods
- void PinchDetected(Actor actor, PinchGesture pinch)
+ void PinchDetected(Actor actor, const PinchGesture& pinch)
{
mControlImpl.OnPinch(pinch);
}
- void PanDetected(Actor actor, PanGesture pan)
+ void PanDetected(Actor actor, const PanGesture& pan)
{
mControlImpl.OnPan(pan);
}
- void TapDetected(Actor actor, TapGesture tap)
+ void TapDetected(Actor actor, const TapGesture& tap)
{
mControlImpl.OnTap(tap);
}
- void LongPressDetected(Actor actor, LongPressGesture longPress)
+ void LongPressDetected(Actor actor, const LongPressGesture& longPress)
{
mControlImpl.OnLongPress(longPress);
}
- /**
- * @copydoc ConnectionTrackerInterface::SignalConnected
- */
- virtual void SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
- {
- mConnectionTracker.SignalConnected( slotObserver, callback );
- }
-
- /**
- * @copydoc ConnectionTrackerInterface::SignalDisconnected
- */
- virtual void SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
- {
- mConnectionTracker.SignalDisconnected( slotObserver, callback );
- }
-
- /**
- * @copydoc ConnectionTrackerInterface::GetConnectionCount
- */
- virtual std::size_t GetConnectionCount() const
- {
- return mConnectionTracker.GetConnectionCount();
- }
-
// Background Methods
/**
*/
static void SetProperty( BaseObject* object, Property::Index index, const Property::Value& value )
{
- Control control = Control::DownCast( BaseHandle( object ) );
+ Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
if ( control )
{
- ControlImpl& controlImpl( control.GetImplementation() );
+ Control& controlImpl( control.GetImplementation() );
switch ( index )
{
- case Control::PROPERTY_BACKGROUND_COLOR:
+ 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 Control::PROPERTY_BACKGROUND:
+ case Toolkit::Control::Property::BACKGROUND_IMAGE:
{
if ( value.HasKey( "image" ) )
{
if ( image )
{
- controlImpl.SetBackground( image );
+ controlImpl.SetBackgroundImage( image );
}
}
- else if ( value.Get< Property::Map >().empty() )
+ else if ( value.Get< Property::Map >().Empty() )
{
// An empty map means the background is no longer required
controlImpl.ClearBackground();
}
break;
}
+
+ case Toolkit::Control::Property::KEY_INPUT_FOCUS:
+ {
+ if ( value.Get< bool >() )
+ {
+ controlImpl.SetKeyInputFocus();
+ }
+ else
+ {
+ controlImpl.ClearKeyInputFocus();
+ }
+ break;
+ }
}
}
}
{
Property::Value value;
- Control control = Control::DownCast( BaseHandle( object ) );
+ Toolkit::Control control = Toolkit::Control::DownCast( BaseHandle( object ) );
if ( control )
{
- ControlImpl& controlImpl( control.GetImplementation() );
+ Control& controlImpl( control.GetImplementation() );
switch ( index )
{
- case Control::PROPERTY_BACKGROUND_COLOR:
+ case Toolkit::Control::Property::STYLE_NAME:
+ {
+ value = controlImpl.GetStyleName();
+ break;
+ }
+
+ case Toolkit::Control::Property::BACKGROUND_COLOR:
{
value = controlImpl.GetBackgroundColor();
break;
}
- case Control::PROPERTY_BACKGROUND:
+ case Toolkit::Control::Property::BACKGROUND_IMAGE:
{
Property::Map map;
Image image = imageActor.GetImage();
Property::Map imageMap;
Scripting::CreatePropertyMap( image, imageMap );
- map.push_back( Property::StringValuePair( "image", imageMap ) );
+ map[ "image" ] = imageMap;
}
}
break;
}
+ case Toolkit::Control::Property::KEY_INPUT_FOCUS:
+ {
+ value = controlImpl.HasKeyInputFocus();
+ break;
+ }
}
}
// Data
- ControlImpl& mControlImpl;
-
- bool mInitialized:1;
-
- ConnectionTracker mConnectionTracker; // signal connection tracker
+ 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;
// Gesture Detection
-
- PinchGestureDetector mPinchGestureDetector;
- PanGestureDetector mPanGestureDetector;
- TapGestureDetector mTapGestureDetector;
+ 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.
- Vector3 mStartingPinchScale; ///< The scale when a pinch gesture starts
-
- // Relayout and size negotiation
-
- bool mLockSetSize; ///< Used to avoid. Can't be a bitfield as a reference to this member is used in SetSizeLock helper class.
-
- Control::SizePolicy mWidthPolicy; ///< Stores the width policy.
- Control::SizePolicy mHeightPolicy; ///< Stores the height policy.
-
- Vector3 mSize; ///< Stores the current control's size.
- Vector3 mSetSize; ///< Always stores the size set through the Actor's API. Useful when reset to the initial size is needed.
- Vector3 mMinimumSize; ///< Stores the control's minimum size.
- Vector3 mMaximumSize; ///< Stores the control's maximum size.
+ ControlBehaviour mFlags :6; ///< Flags passed in from constructor. Need to increase this size when new enums are added
+ 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 mIsKeyboardNavigationSupported; ///< Stores whether keyboard navigation is supported by the control.
- bool mIsKeyboardFocusGroup; ///< Stores whether the control is a focus group.
-
- Toolkit::Control::KeyEventSignalV2 mKeyEventSignalV2;
-
- // Background
- Background* mBackground; ///< Only create the background if we use it
-
- // Properties - need to be part of this class as ControlImpl::Impl is private
+ // 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;
};
-PropertyRegistration ControlImpl::Impl::PROPERTY_1( CONTROL_TYPE, "background-color", Control::PROPERTY_BACKGROUND_COLOR, Property::VECTOR4, &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
-PropertyRegistration ControlImpl::Impl::PROPERTY_2( CONTROL_TYPE, "background", Control::PROPERTY_BACKGROUND, Property::MAP, &ControlImpl::Impl::SetProperty, &ControlImpl::Impl::GetProperty );
+// 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 );
-Control ControlImpl::New()
+Toolkit::Control Control::New()
{
// Create the implementation, temporarily owned on stack
- IntrusivePtr<ControlImpl> controlImpl = new ControlImpl( false );
+ IntrusivePtr<Control> controlImpl = new Control( CONTROL_BEHAVIOUR_NONE );
// Pass ownership to handle
- Control handle( *controlImpl );
+ Toolkit::Control handle( *controlImpl );
// Second-phase init of the implementation
// This can only be done after the CustomActor connection has been made...
return handle;
}
-ControlImpl::~ControlImpl()
+Control::~Control()
{
- if( mImpl->mInitialized )
- {
- // Unregister only if control has been initialized.
- Internal::StyleChangeProcessor::Unregister( this );
- }
delete mImpl;
}
-void ControlImpl::Initialize()
+Vector3 Control::GetNaturalSize()
{
- // Register with the style change processor so we are informed when the default style changes
- Internal::StyleChangeProcessor::Register( this );
-
- // Calling deriving classes
- OnInitialize();
+ // could be overridden in derived classes.
+ return mImpl->mNaturalSize;
+}
- mImpl->mInitialized = true;
+float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension )
+{
+ // Could be overridden in derived classes.
+ return CalculateChildSizeBase( child, dimension );
}
-void ControlImpl::EnableGestureDetection(Gesture::Type type)
+bool Control::RelayoutDependentOnChildren( Dimension::Type dimension )
{
- if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector )
- {
- mImpl->mPinchGestureDetector = PinchGestureDetector::New();
- mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected);
- mImpl->mPinchGestureDetector.Attach(Self());
- }
+ return RelayoutDependentOnChildrenBase( dimension );
+}
- if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector )
+float Control::GetHeightForWidth( float width )
+{
+ // could be overridden in derived classes.
+ float height( 0.0f );
+ if ( mImpl->mNaturalSize.width > 0.0f )
{
- mImpl->mPanGestureDetector = PanGestureDetector::New();
- mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected);
- mImpl->mPanGestureDetector.Attach(Self());
+ height = mImpl->mNaturalSize.height * width / mImpl->mNaturalSize.width;
}
+ return height;
+}
- if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector )
+float Control::GetWidthForHeight( float height )
+{
+ // could be overridden in derived classes.
+ float width( 0.0f );
+ if ( mImpl->mNaturalSize.height > 0.0f )
{
- mImpl->mTapGestureDetector = TapGestureDetector::New();
- mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected);
- mImpl->mTapGestureDetector.Attach(Self());
+ width = mImpl->mNaturalSize.width * height / mImpl->mNaturalSize.height;
}
+ return width;
+}
- if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector )
- {
- mImpl->mLongPressGestureDetector = LongPressGestureDetector::New();
- mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected);
- mImpl->mLongPressGestureDetector.Attach(Self());
- }
+const Vector3& Control::GetControlSize() const
+{
+ return mImpl->mCurrentSize;
}
-void ControlImpl::DisableGestureDetection(Gesture::Type type)
+const Vector3& Control::GetSizeSet() const
{
- if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector )
- {
- mImpl->mPinchGestureDetector.Detach(Self());
- mImpl->mPinchGestureDetector.Reset();
- }
+ return mImpl->mNaturalSize;
+}
- if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector )
+void Control::SetKeyInputFocus()
+{
+ if( Self().OnStage() )
{
- mImpl->mPanGestureDetector.Detach(Self());
- mImpl->mPanGestureDetector.Reset();
+ Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self()));
}
+}
- if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector )
+bool Control::HasKeyInputFocus()
+{
+ bool result = false;
+ if( Self().OnStage() )
{
- mImpl->mTapGestureDetector.Detach(Self());
- mImpl->mTapGestureDetector.Reset();
+ result = Toolkit::KeyInputFocusManager::Get().IsKeyboardListener(Toolkit::Control::DownCast(Self()));
}
+ return result;
+}
- if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector)
+void Control::ClearKeyInputFocus()
+{
+ if( Self().OnStage() )
{
- mImpl->mLongPressGestureDetector.Detach(Self());
- mImpl->mLongPressGestureDetector.Reset();
+ Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self()));
}
}
-PinchGestureDetector ControlImpl::GetPinchGestureDetector() const
+PinchGestureDetector Control::GetPinchGestureDetector() const
{
return mImpl->mPinchGestureDetector;
}
-PanGestureDetector ControlImpl::GetPanGestureDetector() const
+PanGestureDetector Control::GetPanGestureDetector() const
{
return mImpl->mPanGestureDetector;
}
-TapGestureDetector ControlImpl::GetTapGestureDetector() const
+TapGestureDetector Control::GetTapGestureDetector() const
{
return mImpl->mTapGestureDetector;
}
-LongPressGestureDetector ControlImpl::GetLongPressGestureDetector() const
+LongPressGestureDetector Control::GetLongPressGestureDetector() const
{
return mImpl->mLongPressGestureDetector;
}
-void ControlImpl::SetBackgroundColor( const Vector4& color )
+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() );
// Create Mesh Actor
MeshActor meshActor = MeshActor::New( CreateMesh() );
- meshActor.SetAffectedByLighting( false );
- SetupBackgroundActor( meshActor, Actor::SCALE, color );
+ SetupBackgroundActor( meshActor, Actor::Property::SCALE, color );
// Set the background actor before adding so that we do not inform deriving classes
background.actor = meshActor;
background.color = color;
}
-Vector4 ControlImpl::GetBackgroundColor() const
+Vector4 Control::GetBackgroundColor() const
{
if ( mImpl->mBackground )
{
return Color::TRANSPARENT;
}
-void ControlImpl::SetBackground( Image image )
+void Control::SetBackgroundImage( Image image )
{
Background& background( mImpl->GetBackground() );
{
// Remove Current actor, unset AFTER removal so that we do not inform deriving classes
Self().Remove( background.actor );
- background.actor = NULL;
+ background.actor.Reset();
}
ImageActor imageActor = ImageActor::New( image );
- SetupBackgroundActor( imageActor, Actor::SIZE, background.color );
+ SetupBackgroundActor( imageActor, Actor::Property::SIZE, background.color );
// Set the background actor before adding so that we do not inform derived classes
background.actor = imageActor;
Self().Add( imageActor );
}
-void ControlImpl::ClearBackground()
+void Control::ClearBackground()
{
if ( mImpl->mBackground )
{
}
}
-Actor ControlImpl::GetBackgroundActor() const
+Actor Control::GetBackgroundActor() const
{
if ( mImpl->mBackground )
{
return Actor();
}
-void ControlImpl::OnPinch(PinchGesture pinch)
+void Control::SetKeyboardNavigationSupport(bool isSupported)
{
- if (pinch.state == Gesture::Started)
- {
- mImpl->mStartingPinchScale = Self().GetCurrentScale();
- }
-
- Self().SetScale(mImpl->mStartingPinchScale * pinch.scale);
+ mImpl->mIsKeyboardNavigationSupported = isSupported;
}
-void ControlImpl::OnStageConnection()
+bool Control::IsKeyboardNavigationSupported()
{
- RelayoutRequest();
-
- // Notify derived classes.
- OnControlStageConnection();
+ return mImpl->mIsKeyboardNavigationSupported;
}
-void ControlImpl::OnStageDisconnection()
+void Control::Activate()
{
- // Notify derived classes
- OnControlStageDisconnection();
+ // Inform deriving classes
+ OnActivated();
}
-void ControlImpl::OnChildAdd(Actor& child)
+bool Control::OnAccessibilityPan(PanGesture gesture)
{
- // 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;
- }
-
- // Request for relayout.
- RelayoutRequest();
-
- // Notify derived classes.
- OnControlChildAdd( child );
+ return false; // Accessibility pan gesture is not handled by default
}
-void ControlImpl::OnChildRemove(Actor& child)
+bool Control::OnAccessibilityTouch(const TouchEvent& touchEvent)
{
- // 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;
- }
-
- // Request for relayout.
- RelayoutRequest();
-
- // Notify derived classes.
- OnControlChildRemove( child );
+ return false; // Accessibility touch event is not handled by default
}
-void ControlImpl::OnSizeSet(const Vector3& targetSize)
+bool Control::OnAccessibilityValueChange(bool isIncrease)
{
- if( ( !mImpl->mLockSetSize ) && ( targetSize != mImpl->mSetSize ) )
- {
- // Only updates size if set through Actor's API
- mImpl->mSetSize = targetSize;
- }
-
- if( targetSize != mImpl->mSize )
- {
- // Update control size.
- mImpl->mSize = targetSize;
-
- // Notify derived classes.
- OnControlSizeSet( targetSize );
- }
+ return false; // Accessibility value change action is not handled by default
}
-void ControlImpl::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
+void Control::SetAsKeyboardFocusGroup(bool isFocusGroup)
{
- // Do Nothing
-}
+ mImpl->mIsKeyboardFocusGroup = isFocusGroup;
-bool ControlImpl::OnTouchEvent(const TouchEvent& event)
-{
- return false; // Do not consume
+ // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted
+ Toolkit::KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup);
}
-bool ControlImpl::OnKeyEvent(const KeyEvent& event)
+bool Control::IsKeyboardFocusGroup()
{
- return false; // Do not consume
+ return Toolkit::KeyboardFocusManager::Get().IsFocusGroup(Self());
}
-bool ControlImpl::OnMouseWheelEvent(const MouseWheelEvent& event)
+Actor Control::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Toolkit::Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
{
- return false; // Do not consume
+ return Actor();
}
-void ControlImpl::OnKeyInputFocusGained()
+void Control::OnKeyboardFocusChangeCommitted(Actor commitedFocusableActor)
{
- // Do Nothing
}
-void ControlImpl::OnKeyInputFocusLost()
+bool Control::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes)
{
- // Do Nothing
-}
+ bool ret = false;
-Actor ControlImpl::GetChildByAlias(const std::string& actorAlias)
-{
- return Actor();
-}
+ 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();
+ }
+ }
-bool ControlImpl::OnAccessibilityPan(PanGesture gesture)
-{
- return false; // Accessibility pan gesture is not handled by default
+ return ret;
}
-bool ControlImpl::OnAccessibilityValueChange(bool isIncrease)
+bool Control::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor )
{
- return false; // Accessibility value change action is not handled by default
-}
+ Dali::BaseHandle handle( object );
+ bool connected( false );
+ Toolkit::Control control = Toolkit::Control::DownCast( handle );
+ if ( control )
+ {
+ Control& controlImpl( control.GetImplementation() );
+ connected = true;
-void ControlImpl::SetKeyboardNavigationSupport(bool isSupported)
-{
- mImpl->mIsKeyboardNavigationSupported = isSupported;
+ 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;
}
-bool ControlImpl::IsKeyboardNavigationSupported()
+Toolkit::Control::KeyEventSignalType& Control::KeyEventSignal()
{
- return mImpl->mIsKeyboardNavigationSupported;
+ return mImpl->mKeyEventSignal;
}
-void ControlImpl::SetAsKeyboardFocusGroup(bool isFocusGroup)
+bool Control::EmitKeyEventSignal( const KeyEvent& event )
{
- mImpl->mIsKeyboardFocusGroup = isFocusGroup;
+ // Guard against destruction during signal emission
+ Dali::Toolkit::Control handle( GetOwner() );
- // The following line will be removed when the deprecated API in KeyboardFocusManager is deleted
- KeyboardFocusManager::Get().SetAsFocusGroup(Self(), isFocusGroup);
-}
+ bool consumed = false;
-bool ControlImpl::IsKeyboardFocusGroup()
-{
- return KeyboardFocusManager::Get().IsFocusGroup(Self());
+ // signals are allocated dynamically when someone connects
+ if ( !mImpl->mKeyEventSignal.Empty() )
+ {
+ consumed = mImpl->mKeyEventSignal.Emit( handle, event );
+ }
+
+ if (!consumed)
+ {
+ // Notification for derived classes
+ consumed = OnKeyEvent(event);
+ }
+
+ return consumed;
}
-Actor ControlImpl::GetNextKeyboardFocusableActor(Actor currentFocusedActor, Control::KeyboardFocusNavigationDirection direction, bool loopEnabled)
+Control::Control( ControlBehaviour behaviourFlags )
+: CustomActorImpl( behaviourFlags & REQUIRES_TOUCH_EVENTS ),
+ mImpl(new Impl(*this))
{
- return Actor();
+ mImpl->mFlags = behaviourFlags;
}
-bool ControlImpl::DoAction(BaseObject* object, const std::string& actionName, const std::vector<Property::Value>& attributes)
+void Control::Initialize()
{
- bool ret = false;
+ // Calling deriving classes
+ OnInitialize();
- return ret;
-}
+ // 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 );
+ }
-void ControlImpl::DoActivatedAction(const PropertyValueContainer& attributes)
-{
- OnActivated();
+ 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() ) );
+ }
+
+ SetRequiresHoverEvents(mImpl->mFlags & REQUIRES_HOVER_EVENTS);
+ SetRequiresMouseWheelEvents(mImpl->mFlags & REQUIRES_MOUSE_WHEEL_EVENTS);
+
+ mImpl->mInitialized = true;
}
-Toolkit::Control::KeyEventSignalV2& ControlImpl::KeyEventSignal()
+void Control::EnableGestureDetection(Gesture::Type type)
{
- return mImpl->mKeyEventSignalV2;
+ 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 )
+ {
+ 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());
+ }
}
-void ControlImpl::SetSizePolicy( Control::SizePolicy widthPolicy, Control::SizePolicy heightPolicy )
+void Control::DisableGestureDetection(Gesture::Type type)
{
- bool relayoutRequest( false );
+ if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector )
+ {
+ mImpl->mPinchGestureDetector.Detach(Self());
+ mImpl->mPinchGestureDetector.Reset();
+ }
- if ( ( mImpl->mWidthPolicy != widthPolicy ) || ( mImpl->mHeightPolicy != heightPolicy ) )
+ if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector )
{
- relayoutRequest = true;
+ mImpl->mPanGestureDetector.Detach(Self());
+ mImpl->mPanGestureDetector.Reset();
}
- mImpl->mWidthPolicy = widthPolicy;
- mImpl->mHeightPolicy = heightPolicy;
+ if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector )
+ {
+ mImpl->mTapGestureDetector.Detach(Self());
+ mImpl->mTapGestureDetector.Reset();
+ }
- // Ensure RelayoutRequest is called AFTER new policies have been set.
- if ( relayoutRequest )
+ if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector)
{
- RelayoutRequest();
+ mImpl->mLongPressGestureDetector.Detach(Self());
+ mImpl->mLongPressGestureDetector.Reset();
}
}
-void ControlImpl::GetSizePolicy( Control::SizePolicy& widthPolicy, Control::SizePolicy& heightPolicy ) const
+void Control::OnInitialize()
{
- widthPolicy = mImpl->mWidthPolicy;
- heightPolicy = mImpl->mHeightPolicy;
}
-void ControlImpl::SetMinimumSize( const Vector3& size )
+void Control::OnActivated()
{
- if ( mImpl->mMinimumSize != size )
- {
- mImpl->mMinimumSize = size;
-
- // Only relayout if our control is using the minimum or range policy.
- if ( ( mImpl->mHeightPolicy == Control::Minimum ) || ( mImpl->mWidthPolicy == Control::Minimum ) ||
- ( mImpl->mHeightPolicy == Control::Range ) || ( mImpl->mWidthPolicy == Control::Range ) )
- {
- RelayoutRequest();
- }
- }
}
-const Vector3& ControlImpl::GetMinimumSize() const
+void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange change )
{
- return mImpl->mMinimumSize;
+ // By default the control is only interested in theme (not font) changes
+ if( change.themeChange )
+ {
+ GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) );
+ }
}
-void ControlImpl::SetMaximumSize( const Vector3& size )
+void Control::OnPinch(const PinchGesture& pinch)
{
- if ( mImpl->mMaximumSize != size )
+ if( !( mImpl->mStartingPinchScale ) )
{
- mImpl->mMaximumSize = size;
+ // lazy allocate
+ mImpl->mStartingPinchScale = new Vector3;
+ }
- // Only relayout if our control is using the maximum or range policy.
- if ( ( mImpl->mHeightPolicy == Control::Maximum ) || ( mImpl->mWidthPolicy == Control::Maximum ) ||
- ( mImpl->mHeightPolicy == Control::Range ) || ( mImpl->mWidthPolicy == Control::Range ) )
- {
- RelayoutRequest();
- }
+ if( pinch.state == Gesture::Started )
+ {
+ *( mImpl->mStartingPinchScale ) = Self().GetCurrentScale();
}
+
+ Self().SetScale( *( mImpl->mStartingPinchScale ) * pinch.scale );
}
-const Vector3& ControlImpl::GetMaximumSize() const
+void Control::OnPan( const PanGesture& pan )
{
- return mImpl->mMaximumSize;
}
-Vector3 ControlImpl::GetNaturalSize()
+void Control::OnTap(const TapGesture& tap)
{
- // could be overridden in derived classes.
- return mImpl->mSetSize;
}
-float ControlImpl::GetHeightForWidth( float width )
+void Control::OnLongPress( const LongPressGesture& longPress )
{
- // could be overridden in derived classes.
- float height( 0.0f );
- if ( mImpl->mSetSize.width > 0.0f )
- {
- height = mImpl->mSetSize.height * width / mImpl->mSetSize.width;
- }
- return height;
}
-float ControlImpl::GetWidthForHeight( float height )
+void Control::OnControlStageConnection()
{
- // could be overridden in derived classes.
- float width( 0.0f );
- if ( mImpl->mSetSize.height > 0.0f )
- {
- width = mImpl->mSetSize.width * height / mImpl->mSetSize.height;
- }
- return width;
}
-const Vector3& ControlImpl::GetControlSize() const
+void Control::OnControlStageDisconnection()
{
- return mImpl->mSize;
}
-const Vector3& ControlImpl::GetSizeSet() const
+void Control::OnControlChildAdd( Actor& child )
{
- return mImpl->mSetSize;
}
-void ControlImpl::SetKeyInputFocus()
+void Control::OnControlChildRemove( Actor& child )
{
- if( Self().OnStage() )
- {
- KeyInputFocusManager::Get().SetFocus(Control::DownCast(Self()));
- }
}
-bool ControlImpl::HasKeyInputFocus()
+void Control::OnControlSizeSet( const Vector3& size )
{
- bool result = false;
- if( Self().OnStage() )
- {
- result = KeyInputFocusManager::Get().IsKeyboardListener(Control::DownCast(Self()));
- }
- return result;
}
-void ControlImpl::ClearKeyInputFocus()
+void Control::OnCalculateRelayoutSize( Dimension::Type dimension )
{
- if( Self().OnStage() )
- {
- KeyInputFocusManager::Get().RemoveFocus(Control::DownCast(Self()));
- }
}
-void ControlImpl::RelayoutRequest()
+void Control::OnLayoutNegotiated( float size, Dimension::Type dimension )
{
- Internal::RelayoutController::Get().Request();
}
-void ControlImpl::Relayout( Vector2 size, ActorSizeContainer& container )
+void Control::OnRelayout( const Vector2& size, RelayoutContainer& container )
{
- // Avoids relayout again when OnSizeSet callback arrives.
+ for( unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i )
{
- SetSizeLock lock( mImpl->mLockSetSize );
- Self().SetSize( size );
+ container.Add( Self().GetChildAt( i ), size );
}
-
- // Only relayout controls which requested to be relaid out.
- OnRelaidOut( size, container );
}
-void ControlImpl::Relayout( Actor actor, Vector2 size, ActorSizeContainer& container )
+void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension )
{
- if ( actor )
- {
- Control control( Control::DownCast( actor ) );
- if( control )
- {
- control.GetImplementation().NegotiateSize( size, container );
- }
- else
- {
- container.push_back( ActorSizePair( actor, size ) );
- }
- }
}
-void ControlImpl::OnRelaidOut( Vector2 size, ActorSizeContainer& container )
+void Control::OnKeyInputFocusGained()
{
- unsigned int numChildren = Self().GetChildCount();
+ // Do Nothing
+}
- for( unsigned int i=0; i<numChildren; ++i )
- {
- container.push_back( ActorSizePair( Self().GetChildAt(i), size ) );
- }
+void Control::OnKeyInputFocusLost()
+{
+ // Do Nothing
}
-void ControlImpl::NegotiateSize( Vector2 allocatedSize, ActorSizeContainer& container )
+void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize)
{
- Vector2 size;
+ // @todo consider animating negotiated child sizes to target size
+}
- if ( mImpl->mWidthPolicy == Control::Fixed )
- {
- if ( mImpl->mHeightPolicy == Control::Fixed )
- {
- // If a control says it has a fixed size, then use the size set by the application / control.
- Vector2 setSize( mImpl->mSetSize );
- if ( setSize != Vector2::ZERO )
- {
- size = setSize;
+bool Control::OnTouchEvent(const TouchEvent& event)
+{
+ return false; // Do not consume
+}
- // 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->mSetSize.width ) )
- {
- size.width = mImpl->mSetSize.width;
- }
- else
- {
- // Otherwise, set the width to what has been allocated.
- size.width = allocatedSize.width;
- }
+bool Control::OnHoverEvent(const HoverEvent& event)
+{
+ return false; // Do not consume
+}
- // Height is flexible so ask control what the height should be for our width.
- size.height = GetHeightForWidth( size.width );
+bool Control::OnKeyEvent(const KeyEvent& event)
+{
+ return false; // Do not consume
+}
- // Ensure height is within our policy rules
- size.height = Calculate( mImpl->mHeightPolicy, mImpl->mMinimumSize.height, mImpl->mMaximumSize.height, size.height );
- }
- }
- else
- {
- if ( mImpl->mHeightPolicy == Control::Fixed )
- {
- // Height is fixed so if the application / control has set it, then use that.
- if ( !EqualsZero( mImpl->mSetSize.height ) )
- {
- size.height = mImpl->mSetSize.height;
- }
- else
- {
- // Otherwise, set the height to what has been allocated.
- size.height = allocatedSize.height;
- }
+bool Control::OnMouseWheelEvent(const MouseWheelEvent& event)
+{
+ return false; // Do not consume
+}
- // Width is flexible so ask control what the width should be for our height.
- size.width = GetWidthForHeight( size.height );
+void Control::OnStageConnection()
+{
+ // Notify derived classes.
+ OnControlStageConnection();
+}
- // Ensure width is within our policy rules
- size.width = Calculate( mImpl->mWidthPolicy, mImpl->mMinimumSize.width, mImpl->mMaximumSize.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->mMinimumSize.width, mImpl->mMaximumSize.width, allocatedSize.width );
- size.height = Calculate( mImpl->mHeightPolicy, mImpl->mMinimumSize.height, mImpl->mMaximumSize.height, allocatedSize.height );
- }
- }
+void Control::OnStageDisconnection()
+{
+ // Notify derived classes
+ OnControlStageDisconnection();
+}
- // 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 ) )
+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 ) )
{
- size.width = allocatedSize.width;
+ return;
}
- // 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 ) )
+ // 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 ) )
{
- size.height = allocatedSize.height;
+ return;
}
- 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 );
-
- Relayout( size, container );
+ // Notify derived classes.
+ OnControlChildRemove( child );
}
-bool ControlImpl::EmitKeyEventSignal( const KeyEvent& event )
+void Control::OnSizeSet(const Vector3& targetSize)
{
- // Guard against destruction during signal emission
- Dali::Toolkit::Control handle( GetOwner() );
-
- bool consumed = false;
-
- // signals are allocated dynamically when someone connects
- if ( !mImpl->mKeyEventSignalV2.Empty() )
+ if( targetSize != mImpl->mNaturalSize )
{
- consumed = mImpl->mKeyEventSignalV2.Emit( handle, event );
+ // Only updates size if set through Actor's API
+ mImpl->mNaturalSize = targetSize;
}
- if (!consumed)
+ if( targetSize != mImpl->mCurrentSize )
{
- // Notification for derived classes
- consumed = OnKeyEvent(event);
- }
+ // Update control size.
+ mImpl->mCurrentSize = targetSize;
- return consumed;
+ // Notify derived classes.
+ OnControlSizeSet( targetSize );
+ }
}
-void ControlImpl::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
+void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback )
{
mImpl->SignalConnected( slotObserver, callback );
}
-void ControlImpl::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
+void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback )
{
mImpl->SignalDisconnected( slotObserver, callback );
}
-std::size_t ControlImpl::GetConnectionCount() const
-{
- return mImpl->GetConnectionCount();
-}
-
-ControlImpl::ControlImpl( bool requiresTouchEvents )
-: CustomActorImpl( requiresTouchEvents ),
- mImpl(new Impl(*this))
-{
-}
+} // namespace Internal
} // namespace Toolkit
projects / platform / core / uifw / dali-toolkit.git / blobdiff