Self().Add( mLabel );
}
- OnLabelSet();
+ OnLabelSet( false );
RelayoutRequest();
}
// label should be the top of the button
Self().Add( mLabel );
- OnLabelSet();
+ ResetImageLayers();
+ OnLabelSet( true );
RelayoutRequest();
}
/**
* This method is called when the label is set.
+ * @param[in] noPadding Used to bypass padding if the label is to be treated generically.
*/
- virtual void OnLabelSet() {}
+ virtual void OnLabelSet( bool noPadding ) {}
/**
* This method is called when the unselected button image is set
SetDisabledSelectedImage( DISABLED_SELECTED_BUTTON_IMAGE_DIR );
}
-void CheckBoxButton::OnLabelSet()
+void CheckBoxButton::OnLabelSet( bool noPadding )
{
Actor& label = GetLabelActor();
/**
- * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+ * @copydoc Toolkit::Internal::Button::OnButtonInitialize
*/
virtual void OnButtonInitialize();
/**
- * @copydoc Toolkit::Internal::Button::OnLabelSet()
+ * @copydoc Toolkit::Internal::Button::OnLabelSet
*/
- virtual void OnLabelSet();
+ virtual void OnLabelSet( bool noPadding );
/**
- * @copydoc Toolkit::Internal::Button::OnDisabled()
+ * @copydoc Toolkit::Internal::Button::OnDisabled
*/
virtual void OnDisabled();
return value;
}
-void PushButton::OnLabelSet()
+void PushButton::OnLabelSet( bool noPadding )
{
Actor& label = GetLabelActor();
if( label )
{
+ if( noPadding )
+ {
+ mLabelPadding = Padding( 0.0f, 0.0f, 0.0f, 0.0f );
+ }
+
Toolkit::TextLabel textLabel = Toolkit::TextLabel::DownCast( label );
if( textLabel )
{
RelayoutRequest();
}
+
void PushButton::ConfigureSizeNegotiationDimension( Dimension::Type dimension, const std::vector< Actor >& images, Actor& label )
{
ResizePolicy::Type imageResizePolicy = ResizePolicy::FILL_TO_PARENT;
private: // From Button
/**
- * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+ * @copydoc Toolkit::Internal::Button::OnButtonInitialize
*/
virtual void OnButtonInitialize();
/**
- * @copydoc Toolkit::Internal::Button::OnLabelSet()
+ * @copydoc Toolkit::Internal::Button::OnLabelSet
*/
- virtual void OnLabelSet();
+ virtual void OnLabelSet( bool noPadding );
/**
- * @copydoc Toolkit::Internal::Button::OnButtonImageSet()
+ * @copydoc Toolkit::Internal::Button::OnButtonImageSet
*/
virtual void OnButtonImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnSelectedImageSet()
+ * @copydoc Toolkit::Internal::Button::OnSelectedImageSet
*/
virtual void OnSelectedImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnBackgroundImage()
+ * @copydoc Toolkit::Internal::Button::OnBackgroundImage
*/
virtual void OnBackgroundImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnSelectedBackgroundImageSet()
+ * @copydoc Toolkit::Internal::Button::OnSelectedBackgroundImageSet
*/
virtual void OnSelectedBackgroundImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnDisabledImageSet()
+ * @copydoc Toolkit::Internal::Button::OnDisabledImageSet
*/
virtual void OnDisabledImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnDisabledSelectedImageSet()
+ * @copydoc Toolkit::Internal::Button::OnDisabledSelectedImageSet
*/
virtual void OnDisabledSelectedImageSet();
/**
- * @copydoc Toolkit::Internal::Button::OnDisabledBackgroundImageSet()
+ * @copydoc Toolkit::Internal::Button::OnDisabledBackgroundImageSet
*/
virtual void OnDisabledBackgroundImageSet();
}
}
-void RadioButton::OnLabelSet()
+void RadioButton::OnLabelSet( bool noPadding )
{
Actor& label = GetLabelActor();
private: // From Button
/**
- * @copydoc Toolkit::Internal::Button::OnButtonInitialize()
+ * @copydoc Toolkit::Internal::Button::OnButtonInitialize
*/
virtual void OnButtonInitialize();
/**
- * @copydoc Toolkit::Internal::Button::OnButtonUp()
+ * @copydoc Toolkit::Internal::Button::OnButtonUp
*/
virtual void OnButtonUp();
/**
- * @copydoc Toolkit::Internal::Button::OnSelected()
+ * @copydoc Toolkit::Internal::Button::OnSelected
*/
virtual void OnSelected();
/**
- * @copydoc Toolkit::Internal::Button::OnLabelSet()
+ * @copydoc Toolkit::Internal::Button::OnLabelSet
*/
- virtual void OnLabelSet();
+ virtual void OnLabelSet( bool noPadding );
private: