// EXTERNAL INCLUDES
#include <dali/public-api/actors/image-actor.h>
#include <dali/public-api/object/type-registry.h>
+#include <dali/devel-api/object/type-registry-helper.h>
+#include <dali/public-api/images/resource-image.h>
+#include <dali/devel-api/scripting/scripting.h>
// INTERNAL INCLUDES
#include <dali-toolkit/public-api/controls/text-controls/text-label.h>
namespace
{
-const float TEXT_PADDING = 12.0f;
-const float ANIMATION_TIME( 0.2f );
+const float ANIMATION_TIME( 0.2f );
+const Padding DEFAULT_LABEL_PADDING( 12.0f, 12.0f, 12.0f, 12.0f );
+const Padding DEFAULT_ICON_PADDING( 12.0f, 12.0f, 12.0f, 12.0f );
BaseHandle Create()
{
return Toolkit::PushButton::New();
}
-TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::Button), Create );
+// Properties
+
+DALI_TYPE_REGISTRATION_BEGIN( Toolkit::PushButton, Toolkit::Button, Create )
+
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "unselectedIcon", STRING, UNSELECTED_ICON )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "selectedIcon", STRING, SELECTED_ICON )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconAlignment", STRING, ICON_ALIGNMENT )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "labelPadding", STRING, LABEL_PADDING )
+DALI_PROPERTY_REGISTRATION( Toolkit, PushButton, "iconPadding", STRING, ICON_PADDING )
+
+DALI_TYPE_REGISTRATION_END()
+
+/*
+ * Table to define Text-to-enum conversions for IconAlignment.
+ */
+const Dali::Scripting::StringEnum IconAlignmentTable[] = {
+ { "LEFT", Toolkit::Internal::PushButton::LEFT },
+ { "RIGHT", Toolkit::Internal::PushButton::RIGHT },
+ { "TOP", Toolkit::Internal::PushButton::TOP },
+ { "BOTTOM", Toolkit::Internal::PushButton::BOTTOM },
+}; const unsigned int IconAlignmentTableCount = sizeof( IconAlignmentTable ) / sizeof( IconAlignmentTable[0] );
+
+const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-up.9.png";
+const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-down.9.png";
+const char* const DISABLED_UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-disabled.9.png";
+const char* const DISABLED_SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "button-down-disabled.9.png";
} // unnamed namespace
PushButton::PushButton()
: Button(),
+ mLabelPadding( DEFAULT_LABEL_PADDING ),
+ mIconPadding( DEFAULT_ICON_PADDING ),
+ mIconAlignment( RIGHT ),
mSize()
{
SetAnimationTime( ANIMATION_TIME );
// Set resize policy to natural size so that buttons will resize to background images
self.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS );
+
+ SetUnselectedImage( UNSELECTED_BUTTON_IMAGE_DIR );
+ SetSelectedImage( SELECTED_BUTTON_IMAGE_DIR );
+ SetDisabledImage( DISABLED_UNSELECTED_BUTTON_IMAGE_DIR );
+ SetDisabledSelectedImage( DISABLED_SELECTED_BUTTON_IMAGE_DIR );
}
-void PushButton::OnLabelSet()
+void PushButton::SetIcon( DecorationState state, const std::string iconFilename )
{
- Actor& label = GetLabel();
-
- if( label )
- {
- label.SetAnchorPoint( AnchorPoint::CENTER );
- label.SetParentOrigin( ParentOrigin::CENTER );
-
- Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label );
- if( textLabel )
- {
- textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" );
- textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" );
- textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, true );
- }
-
- ConfigureSizeNegotiation();
- }
+ mIconName[ state ] = iconFilename;
+ SetDecoration( state, ImageActor::New( Dali::ResourceImage::New( iconFilename ) ) );
+ ConfigureSizeNegotiation();
}
-void PushButton::OnButtonImageSet()
+std::string& PushButton::GetIcon( DecorationState state )
{
- ConfigureSizeNegotiation();
- RelayoutRequest();
+ return mIconName[ state ];
}
-void PushButton::OnSelectedImageSet()
+void PushButton::SetIconAlignment( const PushButton::IconAlignment iconAlignment )
{
+ mIconAlignment = iconAlignment;
ConfigureSizeNegotiation();
- RelayoutRequest();
}
-void PushButton::OnBackgroundImageSet()
+const PushButton::IconAlignment PushButton::GetIconAlignment() const
{
- ConfigureSizeNegotiation();
- RelayoutRequest();
+ return mIconAlignment;
}
-void PushButton::OnSelectedBackgroundImageSet()
+void PushButton::SetLabelPadding( const Vector4& padding )
{
+ mLabelPadding = Padding( padding.x, padding.y, padding.z, padding.w );
ConfigureSizeNegotiation();
- RelayoutRequest();
}
-void PushButton::OnDisabledImageSet()
+Vector4 PushButton::GetLabelPadding()
{
- ConfigureSizeNegotiation();
- RelayoutRequest();
+ return Vector4( mLabelPadding.left, mLabelPadding.right, mLabelPadding.top, mLabelPadding.bottom );
}
-void PushButton::OnDisabledBackgroundImageSet()
+void PushButton::SetIconPadding( const Vector4& padding )
{
+ mIconPadding = Padding( padding.x, padding.y, padding.z, padding.w );
ConfigureSizeNegotiation();
- RelayoutRequest();
}
-bool PushButton::OnSelected()
+Vector4 PushButton::GetIconPadding()
{
- Actor& buttonImage = GetButtonImage();
- Actor& selectedImage = GetSelectedImage();
- Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+ return Vector4( mIconPadding.left, mIconPadding.right, mIconPadding.top, mIconPadding.bottom );
+}
- PaintState paintState = GetPaintState();
+void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value )
+{
+ Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
- switch( paintState )
+ if ( pushButton )
{
- case UnselectedState:
- {
- FadeOutImage( buttonImage );
- FadeInImage( selectedBackgroundImage );
- FadeInImage( selectedImage );
- StartTransitionAnimation();
- break;
- }
- case SelectedState:
- {
- FadeOutImage( selectedBackgroundImage );
- FadeOutImage( selectedImage );
- FadeInImage( buttonImage );
- StartTransitionAnimation();
- break;
- }
- case UnselectedSelectedTransition:
+ PushButton& pushButtonImpl( GetImplementation( pushButton ) );
+
+ switch ( propertyIndex )
{
- float opacity = 1.f;
- if( selectedImage )
+ case Toolkit::PushButton::Property::UNSELECTED_ICON:
{
- opacity = selectedImage.GetCurrentOpacity();
+ pushButtonImpl.SetIcon( UNSELECTED_DECORATION, value.Get< std::string >() );
+ break;
}
-
- StopTransitionAnimation( false );
- FadeOutImage( selectedBackgroundImage, opacity );
- FadeOutImage( selectedImage, opacity );
- FadeInImage( buttonImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
- }
- case SelectedUnselectedTransition:
- {
- float opacity = 0.f;
- if( selectedImage )
+ case Toolkit::PushButton::Property::SELECTED_ICON:
{
- opacity = selectedImage.GetCurrentOpacity();
+ pushButtonImpl.SetIcon( SELECTED_DECORATION, value.Get< std::string >() );
+ break;
+ }
+ case Toolkit::PushButton::Property::ICON_ALIGNMENT:
+ {
+ IconAlignment iconAlignment;
+ if( Scripting::GetEnumeration< IconAlignment >( value.Get< std::string >().c_str(), IconAlignmentTable, IconAlignmentTableCount, iconAlignment ) )
+ {
+ pushButtonImpl.SetIconAlignment( iconAlignment );
+ }
+ break;
+ }
+ case Toolkit::PushButton::Property::LABEL_PADDING:
+ {
+ pushButtonImpl.SetLabelPadding( value.Get< Vector4 >() );
+ break;
+ }
+ case Toolkit::PushButton::Property::ICON_PADDING:
+ {
+ pushButtonImpl.SetIconPadding( value.Get< Vector4 >() );
+ break;
}
-
- StopTransitionAnimation( false );
- FadeOutImage( buttonImage, 1.f - opacity );
- FadeInImage( selectedBackgroundImage, opacity );
- FadeInImage( selectedImage, opacity );
- StartTransitionAnimation();
- break;
- }
- case DisabledUnselectedTransition:
- {
- StopTransitionAnimation();
- FadeOutImage( buttonImage );
- FadeInImage( selectedBackgroundImage );
- FadeInImage( selectedImage );
- StartTransitionAnimation();
- break;
- }
- case DisabledSelectedTransition:
- {
- StopTransitionAnimation();
- FadeOutImage( selectedBackgroundImage );
- FadeOutImage( selectedImage );
- FadeInImage( buttonImage );
- StartTransitionAnimation();
- break;
- }
- default:
- {
- break;
}
}
-
- if( mTransitionAnimation )
- {
- return true;
- }
-
- return false;
}
-bool PushButton::OnDisabled()
+Property::Value PushButton::GetProperty( BaseObject* object, Property::Index propertyIndex )
{
- Actor& buttonImage = GetButtonImage();
- Actor& selectedImage = GetSelectedImage();
- Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
- Actor& backgroundImage = GetBackgroundImage();
- Actor& disabledImage = GetDisabledImage();
- Actor& disabledSelectedImage = GetDisabledSelectedImage();
- Actor& disabledBackgroundImage = GetDisabledBackgroundImage();
+ Property::Value value;
- PaintState paintState = GetPaintState();
+ Toolkit::PushButton pushButton = Toolkit::PushButton::DownCast( Dali::BaseHandle( object ) );
- switch( paintState )
+ if ( pushButton )
{
- case UnselectedState:
- {
- FadeOutImage( backgroundImage );
- FadeOutImage( buttonImage );
- FadeInImage( disabledBackgroundImage );
- FadeInImage( disabledImage );
- StartTransitionAnimation();
- break;
- }
- case SelectedState:
- {
- FadeOutImage( backgroundImage );
- FadeOutImage( selectedBackgroundImage );
- FadeOutImage( selectedImage );
- FadeInImage( disabledBackgroundImage );
- FadeInImage( disabledSelectedImage );
- StartTransitionAnimation();
- break;
- }
- case DisabledUnselectedState:
- {
- FadeOutImage( disabledBackgroundImage );
- FadeOutImage( disabledImage );
- FadeInImage( backgroundImage );
- FadeInImage( buttonImage );
- StartTransitionAnimation();
- break;
- }
- case DisabledSelectedState:
- {
- FadeOutImage( disabledBackgroundImage );
- FadeOutImage( disabledSelectedImage );
- FadeInImage( backgroundImage );
- FadeInImage( selectedBackgroundImage );
- FadeInImage( selectedImage );
- StartTransitionAnimation();
- break;
- }
- case UnselectedSelectedTransition:
- {
- float opacity = 1.f;
- if( selectedImage )
- {
- opacity = selectedImage.GetCurrentOpacity();
- }
+ PushButton& pushButtonImpl( GetImplementation( pushButton ) );
- StopTransitionAnimation();
- FadeOutImage( backgroundImage );
- FadeOutImage( selectedBackgroundImage, opacity );
- FadeOutImage( selectedImage, opacity );
- FadeInImage( disabledBackgroundImage );
- FadeInImage( disabledSelectedImage );
- StartTransitionAnimation();
- break;
- }
- case SelectedUnselectedTransition:
+ switch ( propertyIndex )
{
- float opacity = 1.f;
- if( buttonImage )
+ case Toolkit::PushButton::Property::UNSELECTED_ICON:
{
- opacity = buttonImage.GetCurrentOpacity();
+ value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION );
+ break;
}
-
- StopTransitionAnimation();
- FadeOutImage( backgroundImage );
- FadeOutImage( buttonImage, opacity );
- FadeInImage( disabledBackgroundImage );
- FadeInImage( disabledImage );
- StartTransitionAnimation();
- break;
- }
- case UnselectedDisabledTransition:
- {
- float opacity = 1.f;
- if( disabledImage )
+ case Toolkit::PushButton::Property::SELECTED_ICON:
{
- opacity = disabledImage.GetCurrentOpacity();
+ value = pushButtonImpl.GetIcon( UNSELECTED_DECORATION );
+ break;
}
-
- StopTransitionAnimation( false );
- FadeOutImage( disabledBackgroundImage, opacity );
- FadeOutImage( disabledImage, opacity );
- FadeInImage( backgroundImage, 1.f - opacity );
- FadeInImage( buttonImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
- }
- case DisabledUnselectedTransition:
- {
- float opacity = 1.f;
- if( buttonImage )
+ case Toolkit::PushButton::Property::ICON_ALIGNMENT:
{
- opacity = buttonImage.GetCurrentOpacity();
+ value = Scripting::GetLinearEnumerationName< IconAlignment >( pushButtonImpl.GetIconAlignment(), IconAlignmentTable, IconAlignmentTableCount );
+ break;
}
-
- StopTransitionAnimation( false );
- FadeOutImage( backgroundImage, opacity );
- FadeOutImage( buttonImage, opacity );
- FadeInImage( disabledBackgroundImage, 1.f - opacity );
- FadeInImage( disabledImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
- }
- case SelectedDisabledTransition:
- {
- float opacity = 1.f;
- if( disabledSelectedImage )
+ case Toolkit::PushButton::Property::LABEL_PADDING:
{
- opacity = disabledSelectedImage.GetCurrentOpacity();
+ value = pushButtonImpl.GetLabelPadding();
+ break;
}
-
- StopTransitionAnimation( false );
- FadeOutImage( disabledBackgroundImage, opacity );
- FadeOutImage( disabledSelectedImage, opacity );
- FadeInImage( backgroundImage, 1.f - opacity );
- FadeInImage( selectedBackgroundImage, 1.f - opacity );
- FadeInImage( selectedImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
- }
- case DisabledSelectedTransition:
- {
- float opacity = 1.f;
- if( selectedImage )
+ case Toolkit::PushButton::Property::ICON_PADDING:
{
- opacity = selectedImage.GetCurrentOpacity();
+ value = pushButtonImpl.GetIconPadding();
+ break;
}
-
- StopTransitionAnimation( false );
- FadeOutImage( backgroundImage, opacity );
- FadeOutImage( selectedBackgroundImage, opacity );
- FadeOutImage( selectedImage, opacity );
- FadeInImage( disabledBackgroundImage, 1.f - opacity );
- FadeInImage( disabledSelectedImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
}
}
- if( mTransitionAnimation )
- {
- return true;
- }
-
- return false;
+ return value;
}
-bool PushButton::OnPressed()
+void PushButton::OnLabelSet( bool noPadding )
{
- Actor& buttonImage = GetButtonImage();
- Actor& selectedImage = GetSelectedImage();
- Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
+ Actor& label = GetLabelActor();
- PaintState paintState = GetPaintState();
-
- switch( paintState )
+ if( label )
{
- case UnselectedState:
+ if( noPadding )
{
- FadeOutImage( buttonImage );
- FadeInImage( selectedBackgroundImage );
- FadeInImage( selectedImage );
- StartTransitionAnimation();
- break;
+ mLabelPadding = Padding( 0.0f, 0.0f, 0.0f, 0.0f );
}
- case SelectedUnselectedTransition:
- {
- float opacity = 1.f;
- if( buttonImage )
- {
- opacity = buttonImage.GetCurrentOpacity();
- }
- StopTransitionAnimation( false );
- FadeOutImage( buttonImage, opacity );
- FadeInImage( selectedBackgroundImage, 1.f - opacity );
- FadeInImage( selectedImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
- }
- case DisabledUnselectedTransition:
+ Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label );
+ if( textLabel )
{
- float opacity = 1.f;
- if( buttonImage )
- {
- opacity = buttonImage.GetCurrentOpacity();
- }
-
- StopTransitionAnimation();
- FadeOutImage( buttonImage, opacity );
- FadeInImage( selectedBackgroundImage );
- FadeInImage( selectedImage );
- StartTransitionAnimation();
- break;
+ textLabel.SetProperty( Toolkit::TextLabel::Property::MULTI_LINE, false );
}
- default:
- break;
}
-
- if( mTransitionAnimation )
- {
- return true;
- }
-
- return false;
+ ConfigureSizeNegotiation();
}
-bool PushButton::OnReleased()
+void PushButton::OnButtonImageSet()
{
- Actor& buttonImage = GetButtonImage();
- Actor& selectedImage = GetSelectedImage();
- Actor& selectedBackgroundImage = GetSelectedBackgroundImage();
-
- PaintState paintState = GetPaintState();
+ ConfigureSizeNegotiation();
+}
- switch( paintState )
- {
- case SelectedState:
- {
- FadeOutImage( selectedBackgroundImage );
- FadeOutImage( selectedImage );
- FadeInImage( buttonImage );
- StartTransitionAnimation();
- break;
- }
- case UnselectedSelectedTransition:
- {
- float opacity = 1.f;
- if( selectedImage )
- {
- opacity = selectedImage.GetCurrentOpacity();
- }
+void PushButton::OnSelectedImageSet()
+{
+ ConfigureSizeNegotiation();
+}
- StopTransitionAnimation( false );
- FadeOutImage( selectedBackgroundImage, opacity );
- FadeOutImage( selectedImage, opacity );
- FadeInImage( buttonImage, 1.f - opacity );
- StartTransitionAnimation();
- break;
- }
- case DisabledSelectedTransition:
- {
- float opacity = 1.f;
- if( selectedImage )
- {
- opacity = selectedImage.GetCurrentOpacity();
- }
+void PushButton::OnBackgroundImageSet()
+{
+ ConfigureSizeNegotiation();
+}
- StopTransitionAnimation();
- FadeOutImage( selectedBackgroundImage, opacity );
- FadeOutImage( selectedImage, opacity );
- FadeInImage( buttonImage );
- StartTransitionAnimation();
- break;
- }
- default:
- {
- break;
- }
- }
+void PushButton::OnSelectedBackgroundImageSet()
+{
+ ConfigureSizeNegotiation();
+}
- if( mTransitionAnimation )
- {
- return true;
- }
+void PushButton::OnDisabledImageSet()
+{
+ ConfigureSizeNegotiation();
+}
- return false;
+void PushButton::OnDisabledSelectedImageSet()
+{
+ ConfigureSizeNegotiation();
}
-void PushButton::StopAllAnimations()
+void PushButton::OnDisabledBackgroundImageSet()
{
- StopTransitionAnimation();
+ ConfigureSizeNegotiation();
}
-void PushButton::OnControlSizeSet( const Vector3& targetSize )
+void PushButton::OnSizeSet( const Vector3& targetSize )
{
if( targetSize != mSize )
{
mSize = targetSize;
- Actor& label = GetLabel();
+ Actor& label = GetLabelActor();
if( label )
{
}
}
-void PushButton::StartTransitionAnimation()
+void PushButton::PrepareForTranstionIn( Actor actor )
{
- if( mTransitionAnimation )
- {
- mTransitionAnimation.FinishedSignal().Connect( this, &PushButton::TransitionAnimationFinished );
- mTransitionAnimation.Play();
- }
+ actor.SetOpacity( 0.0f );
}
-void PushButton::StopTransitionAnimation( bool remove )
+void PushButton::PrepareForTranstionOut( Actor actor )
{
- if( mTransitionAnimation )
- {
- mTransitionAnimation.Clear();
- mTransitionAnimation.Reset();
- }
-
- if( remove )
- {
- UpdatePaintTransitionState();
- }
+ actor.SetOpacity( 1.0f );
}
-void PushButton::FadeInImage( Actor& image, float opacity, Vector3 scale )
+void PushButton::OnTransitionIn( Actor actor )
{
- if( image )
- {
- image.SetOpacity( opacity );
- image.SetScale( scale );
-
- if( !mTransitionAnimation )
- {
- mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
- }
+ FadeImageTo( actor, 1.f );
+}
- mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 1.f );
- }
+void PushButton::OnTransitionOut( Actor actor )
+{
+ FadeImageTo( actor, 0.0f );
}
-void PushButton::FadeOutImage( Actor& image, float opacity, Vector3 scale )
+void PushButton::FadeImageTo( Actor actor, float opacity )
{
- if( image )
+ if( actor )
{
- image.SetOpacity( opacity );
- image.SetScale( scale );
+ Dali::Animation transitionAnimation = GetTransitionAnimation();
+ DALI_ASSERT_DEBUG( transitionAnimation );
- if( !mTransitionAnimation )
+ if( transitionAnimation )
{
- mTransitionAnimation = Dali::Animation::New( GetAnimationTime() );
+ transitionAnimation.AnimateTo( Property( actor, Actor::Property::COLOR_ALPHA ), opacity );
}
-
- mTransitionAnimation.AnimateTo( Property( image, Actor::Property::COLOR_ALPHA ), 0.f );
}
}
-void PushButton::TransitionAnimationFinished( Dali::Animation& source )
-{
- StopTransitionAnimation();
-}
-
Vector3 PushButton::GetNaturalSize()
{
Vector3 size;
// If label, test against it's size
- Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabel() );
- if( label )
+ Toolkit::TextLabel label = Toolkit::TextLabel::DownCast( GetLabelActor() );
+
+ Actor icon = GetDecoration( UNSELECTED_DECORATION );
+ if( label || icon )
{
- size.width = std::max( size.width, label.GetRelayoutSize( Dimension::WIDTH ) );
- size.height = std::max( size.height, label.GetRelayoutSize( Dimension::HEIGHT ) );
+ Vector3 labelSize( Vector3::ZERO );
+ Vector3 iconSize( Vector3::ZERO );
+
+ if( label )
+ {
+ Vector3 labelNaturalSize = label.GetNaturalSize();
+ labelSize.width = labelNaturalSize.width + mLabelPadding.left + mLabelPadding.right;
+ labelSize.height = labelNaturalSize.height + mLabelPadding.top + mLabelPadding.bottom;
+ }
+
+ if( icon )
+ {
+ Vector3 iconNaturalSize = icon.GetNaturalSize();
+ iconSize.width = iconNaturalSize.width + mIconPadding.left + mIconPadding.right;
+ iconSize.height = iconNaturalSize.height + mIconPadding.top + mIconPadding.bottom;
+
+ switch( mIconAlignment )
+ {
+ case LEFT:
+ case RIGHT:
+ {
+ size.width = labelSize.width + iconSize.width;
+ size.height = std::max( labelSize.height, iconSize.height );
+ break;
+ }
+ case TOP:
+ case BOTTOM:
+ {
+ size.width = std::max( labelSize.width, iconSize.width );
+ size.height = labelSize.height + iconSize.height;
+ break;
+ }
+ }
+ }
+ else
+ {
+ // No icon, so size is the same as label size.
+ // (If there is no label this is zero).
+ size = labelSize;
+ }
}
else
{
// Check Image and Background image and use the largest size as the control's Natural size.
- SizeOfActorIfLarger( GetButtonImage(), size );
+ SizeOfActorIfLarger( GetUnselectedImage(), size );
SizeOfActorIfLarger( GetBackgroundImage(), size );
}
void PushButton::ConfigureSizeNegotiation()
{
- ActorContainer images;
+ std::vector< Actor > images;
images.reserve( 7 );
- images.push_back( GetButtonImage() );
+ images.push_back( GetUnselectedImage() );
images.push_back( GetSelectedImage() );
images.push_back( GetSelectedBackgroundImage() );
images.push_back( GetBackgroundImage() );
images.push_back( GetDisabledSelectedImage() );
images.push_back( GetDisabledBackgroundImage() );
- Actor label = GetLabel();
+ Actor label = GetLabelActor();
for( unsigned int i = 0; i < Dimension::DIMENSION_COUNT; ++i )
{
ConfigureSizeNegotiationDimension( static_cast< Dimension::Type >( 1 << i ), images, label );
}
+ // Add any vertical padding directly to the actors.
+ Actor icon = GetDecoration( UNSELECTED_DECORATION );
+ Actor selectedIcon = GetDecoration( SELECTED_DECORATION );
+ bool iconExists = icon || selectedIcon;
+
if( label )
{
- Padding padding;
+ label.SetPadding( mLabelPadding );
+ }
+ if( icon )
+ {
+ icon.SetPadding( mIconPadding );
+ }
+ if( selectedIcon )
+ {
+ selectedIcon.SetPadding( mIconPadding );
+ }
- if( label.GetResizePolicy( Dimension::WIDTH ) == ResizePolicy::USE_NATURAL_SIZE )
- {
- padding.left = TEXT_PADDING;
- padding.right = TEXT_PADDING;
- }
+ // Calculate and apply horizontal alignments and offsets
+ // to text and icon (depending on existence).
+ Vector3 iconPosition( Vector3::ZERO );
+ Vector3 labelPosition( Vector3::ZERO );
+ Vector3 iconAnchoring( AnchorPoint::CENTER );
+ Vector3 labelAnchoring( AnchorPoint::CENTER );
+ std::string horizontalLabelAlignment = "CENTER";
+ std::string verticalLabelAlignment = "CENTER";
- if( label.GetResizePolicy( Dimension::HEIGHT ) == ResizePolicy::USE_NATURAL_SIZE )
+ if( iconExists && label )
+ {
+ // There is an icon and a label to lay out.
+ switch( mIconAlignment )
{
- padding.top = TEXT_PADDING;
- padding.bottom = TEXT_PADDING;
+ case LEFT:
+ {
+ iconPosition.x = mIconPadding.left;
+ labelPosition.x = -mLabelPadding.right;
+ iconAnchoring = AnchorPoint::CENTER_LEFT;
+ labelAnchoring = AnchorPoint::CENTER_RIGHT;
+ horizontalLabelAlignment = "END";
+ break;
+ }
+ case RIGHT:
+ {
+ iconPosition.x = -mIconPadding.right;
+ labelPosition.x = mLabelPadding.left;
+ iconAnchoring = AnchorPoint::CENTER_RIGHT;
+ labelAnchoring = AnchorPoint::CENTER_LEFT;
+ horizontalLabelAlignment = "BEGIN";
+ break;
+ }
+ case TOP:
+ {
+ iconPosition.y = mIconPadding.top;
+ labelPosition.y = -mLabelPadding.bottom;
+ iconAnchoring = AnchorPoint::TOP_CENTER;
+ labelAnchoring = AnchorPoint::BOTTOM_CENTER;
+ verticalLabelAlignment = "BOTTOM";
+ break;
+ }
+ case BOTTOM:
+ {
+ iconPosition.y = -mIconPadding.bottom;
+ labelPosition.y = mLabelPadding.top;
+ iconAnchoring = AnchorPoint::BOTTOM_CENTER;
+ labelAnchoring = AnchorPoint::TOP_CENTER;
+ verticalLabelAlignment = "TOP";
+ break;
+ }
}
+ }
- label.SetPadding( padding );
+ // Note: If there is only an icon, or only a label, the default values are now correct.
+ // Setup the icon(s) with the precalculated values.
+ if( icon )
+ {
+ icon.SetPosition( iconPosition );
+ icon.SetParentOrigin( iconAnchoring );
+ icon.SetAnchorPoint( iconAnchoring );
+ }
+ if( selectedIcon )
+ {
+ selectedIcon.SetPosition( iconPosition );
+ selectedIcon.SetParentOrigin( iconAnchoring );
+ selectedIcon.SetAnchorPoint( iconAnchoring );
+ }
+
+ // Setup the label.
+ if( label )
+ {
+ label.SetPosition( labelPosition );
+ label.SetParentOrigin( labelAnchoring );
+ label.SetAnchorPoint( labelAnchoring );
+ label.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, horizontalLabelAlignment );
+ label.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, verticalLabelAlignment );
}
+
+ RelayoutRequest();
}
-void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const ActorContainer& images, Actor& label )
+
+void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label )
{
ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT;
ResizePolicy::Type labelResizePolicy = ResizePolicy::FILL_TO_PARENT;
- switch( Self().GetResizePolicy( dimension ) )
+ ResizePolicy::Type resizePolicy = Self().GetResizePolicy( dimension );
+
+ if( resizePolicy == ResizePolicy::FIT_TO_CHILDREN || resizePolicy == ResizePolicy::USE_NATURAL_SIZE )
{
- case ResizePolicy::FIT_TO_CHILDREN:
- {
- imageResizePolicy = labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE;
- break;
- }
- case ResizePolicy::USE_NATURAL_SIZE:
+ if( label )
{
- if( label )
- {
- labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE;
- }
- else
- {
- imageResizePolicy = ResizePolicy::USE_NATURAL_SIZE;
- }
- break;
+ labelResizePolicy = ResizePolicy::USE_NATURAL_SIZE;
}
- default:
+ else
{
- break;
+ imageResizePolicy = ResizePolicy::USE_NATURAL_SIZE;
}
}
label.SetResizePolicy( labelResizePolicy, dimension );
}
- for( ActorConstIter it = images.begin(), itEnd = images.end(); it != itEnd; ++it )
+ for( std::vector< Actor >::const_iterator it = images.begin(), itEnd = images.end(); it != itEnd; ++it )
{
Actor actor = *it;
if( actor )
}
}
+
} // namespace Internal
} // namespace Toolkit
projects / platform / core / uifw / dali-toolkit.git / blobdiff