X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Fpublic-api%2Fcontrols%2Fcontrol-impl.cpp;h=b4bb4da58a875321d9dfb5a8020d64bcf10348e2;hb=e74563220e35ea81a5b932186221623eed0fc62e;hp=525a02eb113ded0b4d0190a9d012741927be725c;hpb=24ea337df1049251ab2e47c556edc6e8458f9c93;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/public-api/controls/control-impl.cpp b/dali-toolkit/public-api/controls/control-impl.cpp index 525a02e..b4bb4da 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) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2020 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,98 +19,119 @@ #include // EXTERNAL INCLUDES +#include +#include +#include +#include +#include #include // for strcmp #include #include #include -#include -#include -#include -#include -#include -#include // INTERNAL INCLUDES -#include -#include -#include -#include #include #include -#include #include +#include +#include +#include #include #include #include -#include -#include +#include +#include +#include +#include +#include +#include namespace Dali { - namespace Toolkit { - namespace Internal { - namespace { - #if defined(DEBUG_ENABLED) -Debug::Filter* gLogFilter = Debug::Filter::New( Debug::NoLogging, false, "LOG_CONTROL_VISUALS"); +Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, false, "LOG_CONTROL_VISUALS"); #endif -DALI_ENUM_TO_STRING_TABLE_BEGIN( CLIPPING_MODE ) -DALI_ENUM_TO_STRING_WITH_SCOPE( ClippingMode, DISABLED ) -DALI_ENUM_TO_STRING_WITH_SCOPE( ClippingMode, CLIP_CHILDREN ) -DALI_ENUM_TO_STRING_TABLE_END( CLIPPING_MODE ) - /** - * Finds visual in given array, returning true if found along with the iterator for that visual as a out parameter + * @brief Replace the background visual if it's a color visual with the renderIfTransparent property set as required. + * @param[in] controlImpl The control implementation + * @param[in] renderIfTransaparent Whether we should render if the color is transparent */ -bool FindVisual( Property::Index targetIndex, RegisteredVisualContainer& visuals, RegisteredVisualContainer::Iterator& iter ) +void ChangeBackgroundColorVisual(Control& controlImpl, bool renderIfTransparent) { - for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(controlImpl); + + Toolkit::Visual::Base backgroundVisual = controlDataImpl.GetVisual(Toolkit::Control::Property::BACKGROUND); + if(backgroundVisual && backgroundVisual.GetType() == Toolkit::Visual::COLOR) { - if ( (*iter)->index == targetIndex ) - { - return true; - } + Property::Map map; + backgroundVisual.CreatePropertyMap(map); + + // Only change it if it's a color visual + map[Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT] = renderIfTransparent; + controlImpl.SetBackground(map); } - return false; } -Toolkit::Visual::Base GetVisualByName( - RegisteredVisualContainer& visuals, - const std::string& visualName ) +/** + * @brief Creates a clipping renderer if required. + * (EG. If no renders exist and clipping is enabled). + * @param[in] controlImpl The control implementation. + */ +void CreateClippingRenderer(Control& controlImpl) { - Toolkit::Visual::Base visualHandle; - - RegisteredVisualContainer::Iterator iter; - for ( iter = visuals.Begin(); iter != visuals.End(); iter++ ) + // We want to add a transparent background if we do not have one for clipping. + Actor self(controlImpl.Self()); + int clippingMode = ClippingMode::DISABLED; + if(self.GetProperty(Actor::Property::CLIPPING_MODE).Get(clippingMode)) { - Toolkit::Visual::Base visual = (*iter)->visual; - if( visual && visual.GetName() == visualName ) + switch(clippingMode) { - visualHandle = visual; - break; + case ClippingMode::CLIP_CHILDREN: + { + if(self.GetRendererCount() == 0u) + { + Internal::Control::Impl& controlDataImpl = Internal::Control::Impl::Get(controlImpl); + if(controlDataImpl.mVisuals.Empty()) + { + controlImpl.SetBackgroundColor(Color::TRANSPARENT); + } + else + { + // We have visuals, check if we've set the background and re-create it to + // render even if transparent (only if it's a color visual) + ChangeBackgroundColorVisual(controlImpl, true); + } + } + break; + } + + case ClippingMode::DISABLED: + case ClippingMode::CLIP_TO_BOUNDING_BOX: + { + // If we have a background visual, check if it's a color visual and remove the render if transparent flag + ChangeBackgroundColorVisual(controlImpl, false); + break; + } } } - return visualHandle; } } // unnamed namespace - - Toolkit::Control Control::New() { // Create the implementation, temporarily owned on stack - IntrusivePtr controlImpl = new Control( ControlBehaviour( CONTROL_BEHAVIOUR_DEFAULT ) ); + IntrusivePtr controlImpl = new Control(ControlBehaviour(CONTROL_BEHAVIOUR_DEFAULT)); // Pass ownership to handle - Toolkit::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... @@ -119,17 +140,17 @@ Toolkit::Control Control::New() return handle; } -void Control::SetStyleName( const std::string& styleName ) +void Control::SetStyleName(const std::string& styleName) { - if( styleName != mImpl->mStyleName ) + if(styleName != mImpl->mStyleName) { mImpl->mStyleName = styleName; // Apply new style, if stylemanager is available Toolkit::StyleManager styleManager = Toolkit::StyleManager::Get(); - if( styleManager ) + if(styleManager) { - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + GetImpl(styleManager).ApplyThemeStyle(Toolkit::Control(GetOwner())); } } } @@ -139,77 +160,92 @@ const std::string& Control::GetStyleName() const return mImpl->mStyleName; } -void Control::SetBackgroundColor( const Vector4& color ) +void Control::SetBackgroundColor(const Vector4& color) { mImpl->mBackgroundColor = color; - Property::Map map; - map[ Toolkit::DevelVisual::Property::TYPE ] = Toolkit::Visual::COLOR; - map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; - SetBackground( map ); -} + Property::Map map; + map[Toolkit::Visual::Property::TYPE] = Toolkit::Visual::COLOR; + map[Toolkit::ColorVisual::Property::MIX_COLOR] = color; -Vector4 Control::GetBackgroundColor() const -{ - return mImpl->mBackgroundColor; -} + bool renderIfTransparent = false; + int clippingMode = ClippingMode::DISABLED; + if((Self().GetProperty(Actor::Property::CLIPPING_MODE).Get(clippingMode)) && + (clippingMode == ClippingMode::CLIP_CHILDREN)) + { + // If clipping-mode is set to CLIP_CHILDREN, then force visual to add the render even if transparent + map[Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT] = true; + renderIfTransparent = true; + } -void Control::SetBackground( const Property::Map& map ) -{ - Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( map ); - if( visual ) + Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND); + if(visual && visual.GetType() == Toolkit::Visual::COLOR) { - RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); - visual.SetDepthIndex( DepthIndex::BACKGROUND ); + Property::Map visualMap; + visual.CreatePropertyMap(visualMap); - // Trigger a size negotiation request that may be needed by the new visual to relayout its contents. - RelayoutRequest(); + Property::Value* renderValue = visualMap.Find(Toolkit::DevelColorVisual::Property::RENDER_IF_TRANSPARENT); + Property::Value* colorValue = visualMap.Find(Toolkit::ColorVisual::Property::MIX_COLOR); + if(renderValue && colorValue) + { + if((renderValue->Get() == true || colorValue->Get().a > 0.0f) && (renderIfTransparent || color.a > 0.0f)) + { + // Update background color only + mImpl->DoAction(Toolkit::Control::Property::BACKGROUND, DevelColorVisual::Action::UPDATE_PROPERTY, map); + return; + } + } } + + SetBackground(map); } -void Control::SetBackgroundImage( Image image ) +void Control::SetBackground(const Property::Map& map) { - Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual( image ); - if( visual ) + Toolkit::Visual::Base visual = Toolkit::VisualFactory::Get().CreateVisual(map); + visual.SetName("background"); + if(visual) { - RegisterVisual( Toolkit::Control::Property::BACKGROUND, visual ); - visual.SetDepthIndex( DepthIndex::BACKGROUND ); + mImpl->RegisterVisual(Toolkit::Control::Property::BACKGROUND, visual, DepthIndex::BACKGROUND); + + // Trigger a size negotiation request that may be needed by the new visual to relayout its contents. + RelayoutRequest(); } } void Control::ClearBackground() { - UnregisterVisual( Toolkit::Control::Property::BACKGROUND ); - mImpl->mBackgroundColor = Color::TRANSPARENT; + mImpl->UnregisterVisual(Toolkit::Control::Property::BACKGROUND); + mImpl->mBackgroundColor = Color::TRANSPARENT; - // Trigger a size negotiation request that may be needed when unregistering a visual. - RelayoutRequest(); + // Trigger a size negotiation request that may be needed when unregistering a visual. + RelayoutRequest(); } -void Control::EnableGestureDetection(Gesture::Type type) +void Control::EnableGestureDetection(GestureType::Value type) { - if ( (type & Gesture::Pinch) && !mImpl->mPinchGestureDetector ) + if((type & GestureType::PINCH) && !mImpl->mPinchGestureDetector) { mImpl->mPinchGestureDetector = PinchGestureDetector::New(); mImpl->mPinchGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PinchDetected); mImpl->mPinchGestureDetector.Attach(Self()); } - if ( (type & Gesture::Pan) && !mImpl->mPanGestureDetector ) + if((type & GestureType::PAN) && !mImpl->mPanGestureDetector) { mImpl->mPanGestureDetector = PanGestureDetector::New(); mImpl->mPanGestureDetector.DetectedSignal().Connect(mImpl, &Impl::PanDetected); mImpl->mPanGestureDetector.Attach(Self()); } - if ( (type & Gesture::Tap) && !mImpl->mTapGestureDetector ) + if((type & GestureType::TAP) && !mImpl->mTapGestureDetector) { mImpl->mTapGestureDetector = TapGestureDetector::New(); mImpl->mTapGestureDetector.DetectedSignal().Connect(mImpl, &Impl::TapDetected); mImpl->mTapGestureDetector.Attach(Self()); } - if ( (type & Gesture::LongPress) && !mImpl->mLongPressGestureDetector ) + if((type & GestureType::LONG_PRESS) && !mImpl->mLongPressGestureDetector) { mImpl->mLongPressGestureDetector = LongPressGestureDetector::New(); mImpl->mLongPressGestureDetector.DetectedSignal().Connect(mImpl, &Impl::LongPressDetected); @@ -217,27 +253,27 @@ void Control::EnableGestureDetection(Gesture::Type type) } } -void Control::DisableGestureDetection(Gesture::Type type) +void Control::DisableGestureDetection(GestureType::Value type) { - if ( (type & Gesture::Pinch) && mImpl->mPinchGestureDetector ) + if((type & GestureType::PINCH) && mImpl->mPinchGestureDetector) { mImpl->mPinchGestureDetector.Detach(Self()); mImpl->mPinchGestureDetector.Reset(); } - if ( (type & Gesture::Pan) && mImpl->mPanGestureDetector ) + if((type & GestureType::PAN) && mImpl->mPanGestureDetector) { mImpl->mPanGestureDetector.Detach(Self()); mImpl->mPanGestureDetector.Reset(); } - if ( (type & Gesture::Tap) && mImpl->mTapGestureDetector ) + if((type & GestureType::TAP) && mImpl->mTapGestureDetector) { mImpl->mTapGestureDetector.Detach(Self()); mImpl->mTapGestureDetector.Reset(); } - if ( (type & Gesture::LongPress) && mImpl->mLongPressGestureDetector) + if((type & GestureType::LONG_PRESS) && mImpl->mLongPressGestureDetector) { mImpl->mLongPressGestureDetector.Detach(Self()); mImpl->mLongPressGestureDetector.Reset(); @@ -276,7 +312,7 @@ bool Control::IsKeyboardNavigationSupported() void Control::SetKeyInputFocus() { - if( Self().OnStage() ) + if(Self().GetProperty(Actor::Property::CONNECTED_TO_SCENE)) { Toolkit::KeyInputFocusManager::Get().SetFocus(Toolkit::Control::DownCast(Self())); } @@ -285,10 +321,10 @@ void Control::SetKeyInputFocus() bool Control::HasKeyInputFocus() { bool result = false; - if( Self().OnStage() ) + if(Self().GetProperty(Actor::Property::CONNECTED_TO_SCENE)) { Toolkit::Control control = Toolkit::KeyInputFocusManager::Get().GetCurrentFocusControl(); - if( Self() == control ) + if(Self() == control) { result = true; } @@ -298,7 +334,7 @@ bool Control::HasKeyInputFocus() void Control::ClearKeyInputFocus() { - if( Self().OnStage() ) + if(Self().GetProperty(Actor::Property::CONNECTED_TO_SCENE)) { Toolkit::KeyInputFocusManager::Get().RemoveFocus(Toolkit::Control::DownCast(Self())); } @@ -329,202 +365,6 @@ void Control::KeyboardEnter() OnKeyboardEnter(); } -void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual ) -{ - RegisterVisual( index, visual, true ); -} - -void Control::RegisterVisual( Property::Index index, Toolkit::Visual::Base& visual, bool enabled ) -{ - bool visualReplaced ( false ); - Actor self = Self(); - - if( !mImpl->mVisuals.Empty() ) - { - RegisteredVisualContainer::Iterator iter; - // Check if visual (index) is already registered. Replace if so. - if ( FindVisual( index, mImpl->mVisuals, iter ) ) - { - if( (*iter)->visual && self.OnStage() ) - { - Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); - } - - mImpl->StopObservingVisual( (*iter)->visual ); - mImpl->StartObservingVisual( visual ); - - (*iter)->visual = visual; - visualReplaced = true; - } - } - - // If not set, set the name of the visual to the same name as the control's property. - // ( If the control has been type registered ) - if( visual.GetName().empty() ) - { - // Check if the control has been type registered: - TypeInfo typeInfo = TypeRegistry::Get().GetTypeInfo( typeid(*this) ); - if( typeInfo ) - { - // Check if the property index has been registered: - Property::IndexContainer indices; - typeInfo.GetPropertyIndices( indices ); - Property::IndexContainer::Iterator iter = std::find( indices.Begin(), indices.End(), index ); - if( iter != indices.End() ) - { - // If it has, then get it's name and use that for the visual - std::string visualName = typeInfo.GetPropertyName( index ); - visual.SetName( visualName ); - } - } - } - - if( !visualReplaced ) // New registration entry - { - mImpl->mVisuals.PushBack( new RegisteredVisual( index, visual, enabled ) ); - - // monitor when the visuals resources are ready - mImpl->StartObservingVisual( visual ); - - } - - if( visual && self.OnStage() && enabled ) - { - Toolkit::GetImplementation(visual).SetOnStage( self ); - } - - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::RegisterVisual() Registered %s(%d), enabled:%s\n", visual.GetName().c_str(), index, enabled?"T":"F" ); -} - -void Control::UnregisterVisual( Property::Index index ) -{ - RegisteredVisualContainer::Iterator iter; - if ( FindVisual( index, mImpl->mVisuals, iter ) ) - { - // stop observing visual - mImpl->StopObservingVisual( (*iter)->visual ); - - Actor self( Self() ); - Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); - (*iter)->visual.Reset(); - mImpl->mVisuals.Erase( iter ); - } -} - -Toolkit::Visual::Base Control::GetVisual( Property::Index index ) const -{ - RegisteredVisualContainer::Iterator iter; - if ( FindVisual( index, mImpl->mVisuals, iter ) ) - { - return (*iter)->visual; - } - - return Toolkit::Visual::Base(); -} - -void Control::EnableVisual( Property::Index index, bool enable ) -{ - RegisteredVisualContainer::Iterator iter; - if ( FindVisual( index, mImpl->mVisuals, iter ) ) - { - if ( (*iter)->enabled == enable ) - { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Visual %s(%d) already %s\n", (*iter)->visual.GetName().c_str(), index, enable?"enabled":"disabled"); - return; - } - - (*iter)->enabled = enable; - Actor parentActor = Self(); - if ( Self().OnStage() ) // If control not on Stage then Visual will be added when StageConnection is called. - { - if ( enable ) - { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) on stage \n", (*iter)->visual.GetName().c_str(), index ); - Toolkit::GetImplementation((*iter)->visual).SetOnStage( parentActor ); - } - else - { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::EnableVisual Setting %s(%d) off stage \n", (*iter)->visual.GetName().c_str(), index ); - Toolkit::GetImplementation((*iter)->visual).SetOffStage( parentActor ); // No need to call if control not staged. - } - } - } -} - -bool Control::IsVisualEnabled( Property::Index index ) const -{ - RegisteredVisualContainer::Iterator iter; - if ( FindVisual( index, mImpl->mVisuals, iter ) ) - { - return (*iter)->enabled; - } - return false; -} - -Dali::Animation Control::CreateTransition( const Toolkit::TransitionData& handle ) -{ - Dali::Animation transition; - const Internal::TransitionData& transitionData = Toolkit::GetImplementation( handle ); - - if( transitionData.Count() > 0 ) - { - // Setup a Transition from TransitionData. - TransitionData::Iterator end = transitionData.End(); - for( TransitionData::Iterator iter = transitionData.Begin() ; - iter != end; ++iter ) - { - TransitionData::Animator* animator = (*iter); - - Toolkit::Visual::Base visual = GetVisualByName( mImpl->mVisuals, animator->objectName ); - - if( visual ) - { - Internal::Visual::Base& visualImpl = Toolkit::GetImplementation( visual ); - visualImpl.AnimateProperty( transition, *animator ); - } - else - { - // Otherwise, try any actor children of control (Including the control) - Actor child = Self().FindChildByName( animator->objectName ); - if( child ) - { - Property::Index propertyIndex = DevelHandle::GetPropertyIndex( child, animator->propertyKey ); - if( propertyIndex != Property::INVALID_INDEX ) - { - if( animator->animate == false ) - { - if( animator->targetValue.GetType() != Property::NONE ) - { - child.SetProperty( propertyIndex, animator->targetValue ); - } - } - else // animate the property - { - if( animator->initialValue.GetType() != Property::NONE ) - { - child.SetProperty( propertyIndex, animator->initialValue ); - } - - if( ! transition ) - { - transition = Dali::Animation::New( 0.1f ); - } - - transition.AnimateTo( Property( child, propertyIndex ), - animator->targetValue, - animator->alphaFunction, - TimePeriod( animator->timePeriodDelay, - animator->timePeriodDuration ) ); - } - } - } - } - } - } - - return transition; -} - bool Control::OnAccessibilityActivated() { return false; // Accessibility activation is not handled by default @@ -540,11 +380,6 @@ bool Control::OnAccessibilityPan(PanGesture gesture) return false; // Accessibility pan gesture is not handled by default } -bool Control::OnAccessibilityTouch(const TouchEvent& touchEvent) -{ - return false; // Accessibility touch event is not handled by default -} - bool Control::OnAccessibilityValueChange(bool isIncrease) { return false; // Accessibility value change action is not handled by default @@ -579,20 +414,22 @@ Toolkit::Control::KeyInputFocusSignalType& Control::KeyInputFocusLostSignal() return mImpl->mKeyInputFocusLostSignal; } -bool Control::EmitKeyEventSignal( const KeyEvent& event ) +bool Control::EmitKeyEventSignal(const KeyEvent& event) { // Guard against destruction during signal emission - Dali::Toolkit::Control handle( GetOwner() ); + Dali::Toolkit::Control handle(GetOwner()); bool consumed = false; + consumed = mImpl->FilterKeyEvent(event); + // signals are allocated dynamically when someone connects - if ( !mImpl->mKeyEventSignal.Empty() ) + if(!consumed && !mImpl->mKeyEventSignal.Empty()) { - consumed = mImpl->mKeyEventSignal.Emit( handle, event ); + consumed = mImpl->mKeyEventSignal.Emit(handle, event); } - if (!consumed) + if(!consumed) { // Notification for derived classes consumed = OnKeyEvent(event); @@ -601,8 +438,8 @@ bool Control::EmitKeyEventSignal( const KeyEvent& event ) return consumed; } -Control::Control( ControlBehaviour behaviourFlags ) -: CustomActorImpl( static_cast< ActorFlags >( behaviourFlags ) ), +Control::Control(ControlBehaviour behaviourFlags) +: CustomActorImpl(static_cast(behaviourFlags)), mImpl(new Impl(*this)) { mImpl->mFlags = behaviourFlags; @@ -618,27 +455,26 @@ void Control::Initialize() // Call deriving classes so initialised before styling is applied to them. OnInitialize(); - if( (mImpl->mFlags & REQUIRES_STYLE_CHANGE_SIGNALS) || - !(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS) ) + if(!(mImpl->mFlags & DISABLE_STYLE_CHANGE_SIGNALS)) { Toolkit::StyleManager styleManager = StyleManager::Get(); // if stylemanager is available - if( styleManager ) + if(styleManager) { - StyleManager& styleManagerImpl = GetImpl( styleManager ); + StyleManager& styleManagerImpl = GetImpl(styleManager); // Register for style changes - styleManagerImpl.ControlStyleChangeSignal().Connect( this, &Control::OnStyleChange ); + styleManagerImpl.ControlStyleChangeSignal().Connect(this, &Control::OnStyleChange); // Apply the current style - styleManagerImpl.ApplyThemeStyleAtInit( Toolkit::Control( GetOwner() ) ); + styleManagerImpl.ApplyThemeStyleAtInit(Toolkit::Control(GetOwner())); } } - if( mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT ) + if(mImpl->mFlags & REQUIRES_KEYBOARD_NAVIGATION_SUPPORT) { - SetKeyboardNavigationSupport( true ); + SetKeyboardNavigationSupport(true); } } @@ -646,41 +482,33 @@ void Control::OnInitialize() { } -void Control::OnControlChildAdd( Actor& child ) -{ -} - -void Control::OnControlChildRemove( Actor& child ) -{ -} - -void Control::OnStyleChange( Toolkit::StyleManager styleManager, StyleChange::Type change ) +void Control::OnStyleChange(Toolkit::StyleManager styleManager, StyleChange::Type change) { // By default the control is only interested in theme (not font) changes - if( styleManager && change == StyleChange::THEME_CHANGE ) + if(styleManager && change == StyleChange::THEME_CHANGE) { - GetImpl( styleManager ).ApplyThemeStyle( Toolkit::Control( GetOwner() ) ); + GetImpl(styleManager).ApplyThemeStyle(Toolkit::Control(GetOwner())); RelayoutRequest(); } } void Control::OnPinch(const PinchGesture& pinch) { - if( !( mImpl->mStartingPinchScale ) ) + if(!(mImpl->mStartingPinchScale)) { // lazy allocate mImpl->mStartingPinchScale = new Vector3; } - if( pinch.state == Gesture::Started ) + if(pinch.GetState() == GestureState::STARTED) { - *( mImpl->mStartingPinchScale ) = Self().GetCurrentScale(); + *(mImpl->mStartingPinchScale) = Self().GetCurrentProperty(Actor::Property::SCALE); } - Self().SetScale( *( mImpl->mStartingPinchScale ) * pinch.scale ); + Self().SetProperty(Actor::Property::SCALE, *(mImpl->mStartingPinchScale) * pinch.GetScale()); } -void Control::OnPan( const PanGesture& pan ) +void Control::OnPan(const PanGesture& pan) { } @@ -688,131 +516,96 @@ void Control::OnTap(const TapGesture& tap) { } -void Control::OnLongPress( const LongPressGesture& longPress ) +void Control::OnLongPress(const LongPressGesture& longPress) { } -void Control::EmitKeyInputFocusSignal( bool focusGained ) +void Control::EmitKeyInputFocusSignal(bool focusGained) { - Dali::Toolkit::Control handle( GetOwner() ); + Dali::Toolkit::Control handle(GetOwner()); - if ( focusGained ) + if(focusGained) { // signals are allocated dynamically when someone connects - if ( !mImpl->mKeyInputFocusGainedSignal.Empty() ) + if(!mImpl->mKeyInputFocusGainedSignal.Empty()) { - mImpl->mKeyInputFocusGainedSignal.Emit( handle ); + mImpl->mKeyInputFocusGainedSignal.Emit(handle); } } else { // signals are allocated dynamically when someone connects - if ( !mImpl->mKeyInputFocusLostSignal.Empty() ) + if(!mImpl->mKeyInputFocusLostSignal.Empty()) { - mImpl->mKeyInputFocusLostSignal.Emit( handle ); + mImpl->mKeyInputFocusLostSignal.Emit(handle); } } } -void Control::OnStageConnection( int depth ) +void Control::OnSceneConnection(int depth) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::OnSceneConnection number of registered visuals(%d)\n", mImpl->mVisuals.Size()); - Actor self( Self() ); + Actor self(Self()); - for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) + for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter != mImpl->mVisuals.End(); iter++) { // Check whether the visual is empty and enabled - if( (*iter)->visual && (*iter)->enabled ) + if((*iter)->visual && (*iter)->enabled) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageConnection Setting visual(%d) on stage\n", (*iter)->index ); - Toolkit::GetImplementation((*iter)->visual).SetOnStage( self ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::OnSceneConnection Setting visual(%d) on scene\n", (*iter)->index); + Toolkit::GetImplementation((*iter)->visual).SetOnScene(self); } } - if( mImpl->mVisuals.Empty() && ! self.GetRendererCount() ) - { - Property::Value clippingValue = self.GetProperty( Actor::Property::CLIPPING_MODE ); - int clippingMode = ClippingMode::DISABLED; - if( clippingValue.Get( clippingMode ) ) - { - // Add a transparent background if we do not have any renderers or visuals so we clip our children + // The clipping renderer is only created if required. + CreateClippingRenderer(*this); - if( clippingMode == ClippingMode::CLIP_CHILDREN ) - { - // Create a transparent background visual which will also get staged. - SetBackgroundColor( Color::TRANSPARENT ); - } - } - } + // Request to be laid out when the control is connected to the Scene. + // Signal that a Relayout may be needed } -void Control::OnStageDisconnection() +void Control::OnSceneDisconnection() { - for(RegisteredVisualContainer::Iterator iter = mImpl->mVisuals.Begin(); iter!= mImpl->mVisuals.End(); iter++) - { - // Check whether the visual is empty - if( (*iter)->visual ) - { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Control::OnStageDisconnection Setting visual(%d) off stage\n", (*iter)->index ); - Actor self( Self() ); - Toolkit::GetImplementation((*iter)->visual).SetOffStage( self ); - } - } + mImpl->OnSceneDisconnection(); } void Control::OnKeyInputFocusGained() { - EmitKeyInputFocusSignal( true ); + EmitKeyInputFocusSignal(true); } void Control::OnKeyInputFocusLost() { - EmitKeyInputFocusSignal( false ); + EmitKeyInputFocusSignal(false); } void Control::OnChildAdd(Actor& child) { - // Notify derived classes. - OnControlChildAdd( child ); } void Control::OnChildRemove(Actor& child) { - // Notify derived classes. - OnControlChildRemove( child ); } -void Control::OnPropertySet( Property::Index index, Property::Value propertyValue ) +void Control::OnPropertySet(Property::Index index, const Property::Value& propertyValue) { - Actor self( Self() ); - if( index == Actor::Property::CLIPPING_MODE ) + // If the clipping mode has been set, we may need to create a renderer. + // Only do this if we are already on-stage as the OnSceneConnection will handle the off-stage clipping controls. + if((index == Actor::Property::CLIPPING_MODE) && Self().GetProperty(Actor::Property::CONNECTED_TO_SCENE)) { - // Only set the background if we're already on the stage and have no renderers or visuals - - if( mImpl->mVisuals.Empty() && ! self.GetRendererCount() && self.OnStage() ) - { - ClippingMode::Type clippingMode = ClippingMode::DISABLED; - if( Scripting::GetEnumerationProperty< ClippingMode::Type >( propertyValue, CLIPPING_MODE_TABLE, CLIPPING_MODE_TABLE_COUNT, clippingMode ) ) - { - // Add a transparent background if we do not have one so we clip children - - if( clippingMode == ClippingMode::CLIP_CHILDREN ) - { - SetBackgroundColor( Color::TRANSPARENT ); - } - } - } + // Note: This method will handle whether creation of the renderer is required. + CreateClippingRenderer(*this); } } void Control::OnSizeSet(const Vector3& targetSize) { - Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); - if( visual ) + Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND); + if(visual) { - Vector2 size( targetSize ); - visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform + Vector2 size(targetSize); + visual.SetTransformAndSize(Property::Map(), size); // Send an empty map as we do not want to modify the visual's set transform } } @@ -821,107 +614,123 @@ void Control::OnSizeAnimation(Animation& animation, const Vector3& targetSize) // @todo size negotiate background to new size, animate as well? } -bool Control::OnTouchEvent(const TouchEvent& event) +bool Control::OnKeyEvent(const KeyEvent& event) { return false; // Do not consume } -bool Control::OnHoverEvent(const HoverEvent& event) +void Control::OnRelayout(const Vector2& size, RelayoutContainer& container) { - return false; // Do not consume -} + for(unsigned int i = 0, numChildren = Self().GetChildCount(); i < numChildren; ++i) + { + Actor child = Self().GetChildAt(i); + Vector2 newChildSize(size); -bool Control::OnKeyEvent(const KeyEvent& event) -{ - return false; // Do not consume -} + // When set the padding or margin on the control, child should be resized and repositioned. + if((mImpl->mPadding.start != 0) || (mImpl->mPadding.end != 0) || (mImpl->mPadding.top != 0) || (mImpl->mPadding.bottom != 0) || + (mImpl->mMargin.start != 0) || (mImpl->mMargin.end != 0) || (mImpl->mMargin.top != 0) || (mImpl->mMargin.bottom != 0)) + { + Extents padding = mImpl->mPadding; -bool Control::OnWheelEvent(const WheelEvent& event) -{ - return false; // Do not consume -} + Dali::CustomActor ownerActor(GetOwner()); + Dali::LayoutDirection::Type layoutDirection = static_cast(ownerActor.GetProperty(Dali::Actor::Property::LAYOUT_DIRECTION).Get()); -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 ); + if(Dali::LayoutDirection::RIGHT_TO_LEFT == layoutDirection) + { + std::swap(padding.start, padding.end); + } + + newChildSize.width = size.width - (padding.start + padding.end); + newChildSize.height = size.height - (padding.top + padding.bottom); + + // Cannot use childs Position property as it can already have padding and margin applied on it, + // so we end up cumulatively applying them over and over again. + Vector2 childOffset(0.f, 0.f); + childOffset.x += (mImpl->mMargin.start + padding.start); + childOffset.y += (mImpl->mMargin.top + padding.top); + + child.SetProperty(Actor::Property::POSITION, Vector2(childOffset.x, childOffset.y)); + } + container.Add(child, newChildSize); } - Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); - if( visual ) + Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND); + if(visual) { - visual.SetTransformAndSize( Property::Map(), size ); // Send an empty map as we do not want to modify the visual's set transform + visual.SetTransformAndSize(Property::Map(), size); // Send an empty map as we do not want to modify the visual's set transform } } -void Control::OnSetResizePolicy( ResizePolicy::Type policy, Dimension::Type dimension ) +void Control::OnSetResizePolicy(ResizePolicy::Type policy, Dimension::Type dimension) { } Vector3 Control::GetNaturalSize() { - Toolkit::Visual::Base visual = GetVisual( Toolkit::Control::Property::BACKGROUND ); - if( visual ) + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Control::GetNaturalSize for %s\n", Self().GetProperty(Dali::Actor::Property::NAME).c_str()); + Toolkit::Visual::Base visual = mImpl->GetVisual(Toolkit::Control::Property::BACKGROUND); + if(visual) { Vector2 naturalSize; - visual.GetNaturalSize( naturalSize ); - return Vector3( naturalSize ); + visual.GetNaturalSize(naturalSize); + naturalSize.width += (mImpl->mPadding.start + mImpl->mPadding.end); + naturalSize.height += (mImpl->mPadding.top + mImpl->mPadding.bottom); + return Vector3(naturalSize); } return Vector3::ZERO; } -float Control::CalculateChildSize( const Dali::Actor& child, Dimension::Type dimension ) +float Control::CalculateChildSize(const Dali::Actor& child, Dimension::Type dimension) { - return CalculateChildSizeBase( child, dimension ); + return CalculateChildSizeBase(child, dimension); } -float Control::GetHeightForWidth( float width ) +float Control::GetHeightForWidth(float width) { - return GetHeightForWidthBase( width ); + return GetHeightForWidthBase(width); } -float Control::GetWidthForHeight( float height ) +float Control::GetWidthForHeight(float height) { - return GetWidthForHeightBase( height ); + return GetWidthForHeightBase(height); } -bool Control::RelayoutDependentOnChildren( Dimension::Type dimension ) +bool Control::RelayoutDependentOnChildren(Dimension::Type dimension) { - return RelayoutDependentOnChildrenBase( dimension ); + return RelayoutDependentOnChildrenBase(dimension); } -void Control::OnCalculateRelayoutSize( Dimension::Type dimension ) +void Control::OnCalculateRelayoutSize(Dimension::Type dimension) { } -void Control::OnLayoutNegotiated( float size, Dimension::Type dimension ) +void Control::OnLayoutNegotiated(float size, Dimension::Type dimension) { } -void Control::SignalConnected( SlotObserver* slotObserver, CallbackBase* callback ) +void Control::SignalConnected(SlotObserver* slotObserver, CallbackBase* callback) { - mImpl->SignalConnected( slotObserver, callback ); + mImpl->SignalConnected(slotObserver, callback); } -void Control::SignalDisconnected( SlotObserver* slotObserver, CallbackBase* callback ) +void Control::SignalDisconnected(SlotObserver* slotObserver, CallbackBase* callback) { - mImpl->SignalDisconnected( slotObserver, callback ); + mImpl->SignalDisconnected(slotObserver, callback); } -Control& GetImplementation( Dali::Toolkit::Control& handle ) +Control& GetImplementation(Dali::Toolkit::Control& handle) { CustomActorImpl& customInterface = handle.GetImplementation(); // downcast to control - Control& impl = dynamic_cast< Internal::Control& >( customInterface ); + Control& impl = dynamic_cast(customInterface); return impl; } -const Control& GetImplementation( const Dali::Toolkit::Control& handle ) +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 ); + const Control& impl = dynamic_cast(customInterface); return impl; }