*
*/
-
// CLASS HEADER
#include "radio-button-impl.h"
// EXTERNAL INCLUDES
+#include <dali/integration-api/debug.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/images/resource-image.h>
+
+#if defined(DEBUG_ENABLED)
+extern Debug::Filter* gLogButtonFilter;
+#endif
namespace Dali
{
-
namespace Toolkit
{
-
namespace Internal
{
-
namespace
{
-
BaseHandle Create()
{
return Toolkit::RadioButton::New();
}
-TypeRegistration typeRegistration( typeid( Toolkit::RadioButton ), typeid( Toolkit::Button ), Create);
-
-const char* const UNSELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-unselected.png";
-const char* const SELECTED_BUTTON_IMAGE_DIR = DALI_IMAGE_DIR "radio-button-selected.png";
+TypeRegistration typeRegistration(typeid(Toolkit::RadioButton), typeid(Toolkit::Button), Create);
-const Vector3 DISTANCE_BETWEEN_IMAGE_AND_LABEL(5.0f, 0.0f, 0.0f);
-}
+} // namespace
Dali::Toolkit::RadioButton RadioButton::New()
{
// Create the implementation, temporarily owned on stack
- IntrusivePtr< RadioButton > internalRadioButton = new RadioButton();
+ IntrusivePtr<RadioButton> internalRadioButton = new RadioButton();
// Pass ownership to CustomActor
Dali::Toolkit::RadioButton radioButton(*internalRadioButton);
{
}
-void RadioButton::SetButtonImage( Actor image )
+void RadioButton::OnInitialize()
{
- Actor& buttonImage = GetButtonImage();
-
- if( !IsSelected() )
- {
- if( buttonImage && buttonImage.GetParent() )
- {
- buttonImage.GetParent().Remove( buttonImage );
- buttonImage.Reset();
- }
-
- Self().Add( image );
-
- Actor& label = GetLabel();
-
- if( label )
- {
- buttonImage.Remove( label );
- image.Add( label );
- }
- }
+ Button::OnInitialize();
- buttonImage = image;
-
- buttonImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- buttonImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
+ return std::unique_ptr<Dali::Accessibility::Accessible>(
+ new AccessibleImpl(actor, Dali::Accessibility::Role::RADIO_BUTTON));
+ });
}
-void RadioButton::SetSelectedImage( Actor image )
+bool RadioButton::OnToggleReleased()
{
- Actor& selectedImage = GetSelectedImage();
-
- if( IsSelected() )
- {
- if( selectedImage && selectedImage.GetParent() )
- {
- selectedImage.GetParent().Remove( selectedImage );
- selectedImage.Reset();
- }
-
- Self().Add( image );
-
- Actor& label = GetLabel();
-
- if( label )
- {
- selectedImage.Remove( label );
- image.Add( label );
- }
- }
-
- selectedImage = image;
-
- selectedImage.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- selectedImage.SetParentOrigin( ParentOrigin::TOP_LEFT );
+ // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly.
+ return false;
}
-void RadioButton::OnButtonInitialize()
+void RadioButton::OnStateChange(State newState)
{
- Image buttonImage = Dali::ResourceImage::New( UNSELECTED_BUTTON_IMAGE_DIR );
- Image selectedImage = Dali::ResourceImage::New( SELECTED_BUTTON_IMAGE_DIR );
-
- SetButtonImage( ImageActor::New( buttonImage ) );
- SetSelectedImage( ImageActor::New( selectedImage ) );
+ // Radio button can be part of a group, if a button in the group is selected then all others should be unselected
+ DALI_LOG_INFO(gLogButtonFilter, Debug::Verbose, "RadioButton::OnStateChange state(%d)\n", newState);
- RelayoutRequest();
-}
-
-void RadioButton::OnButtonUp()
-{
- if( ButtonDown == GetState() )
- {
- // Don't allow selection on an already selected radio button
- if( !IsSelected() )
- {
- SetSelected(!IsSelected());
- }
- }
-}
-
-void RadioButton::OnLabelSet()
-{
- Actor& label = GetLabel();
-
- if( label )
- {
- label.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
- label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
- label.TranslateBy( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
-
- if( IsSelected() )
- {
- GetSelectedImage().Add( label );
- }
- else
- {
- GetButtonImage().Add( label );
- }
- }
-}
-
-void RadioButton::OnSelected( bool selected )
-{
- Actor& buttonImage = GetButtonImage();
- Actor& selectedImage = GetSelectedImage();
- Actor& label = GetLabel();
-
- if( selected )
+ if(SELECTED_STATE == newState)
{
Actor parent = Self().GetParent();
- if( parent )
+ if(parent)
{
- for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
+ for(unsigned int i = 0; i < parent.GetChildCount(); ++i)
{
- Dali::Toolkit::RadioButton rbChild = Dali::Toolkit::RadioButton::DownCast(parent.GetChildAt(i));
-
- if( rbChild )
+ Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast(parent.GetChildAt(i));
+ if(radioButtonChild && radioButtonChild != Self())
{
- rbChild.SetSelected(false);
+ radioButtonChild.SetProperty(Toolkit::Button::Property::SELECTED, false);
}
}
}
-
- buttonImage.GetParent().Remove( buttonImage );
- Self().Add( selectedImage );
-
- if( label )
- {
- label.GetParent().Remove( label );
- selectedImage.Add( label );
- }
}
- else
- {
- selectedImage.GetParent().Remove( selectedImage );
- Self().Add( buttonImage );
- if( label )
- {
- label.GetParent().Remove( label );
- buttonImage.Add( label );
- }
+ // TODO: replace it with OnPropertySet hook once Button::Property::SELECTED will be consistently used
+ if(Dali::Accessibility::IsUp() && (Dali::Accessibility::Accessible::GetCurrentlyHighlightedActor() == Self())
+ && (newState == SELECTED_STATE || newState == UNSELECTED_STATE))
+ {
+ Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
}
}
-void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
+Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
{
- Vector3 newSize;
+ auto state = Button::AccessibleImpl::CalculateStates();
+ auto self = Toolkit::Button::DownCast(Self());
- if( IsSelected() )
+ if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
{
- newSize = GetSelectedImage().GetNaturalSize();
- }
- else
- {
- newSize = GetButtonImage().GetNaturalSize();
- }
-
- Actor& label = GetLabel();
-
- if( label )
- {
- // Offset the label from the radio button image
- newSize.width += DISTANCE_BETWEEN_IMAGE_AND_LABEL.width;
-
- // Find the size of the control using size negotiation
- Vector3 actorNaturalSize( label.GetNaturalSize() );
- Control::Relayout( label, Vector2( actorNaturalSize.width, actorNaturalSize.height ), container );
-
- Vector3 actorSize( label.GetSize() );
- newSize.width += actorSize.width;
- newSize.height = std::max( newSize.height, actorSize.height );
+ state[Dali::Accessibility::State::CHECKED] = true;
}
- Self().SetSize( newSize );
+ state[Dali::Accessibility::State::SELECTABLE] = true;
+ return state;
}
} // namespace Internal
projects / platform / core / uifw / dali-toolkit.git / blobdiff