*
*/
-
// CLASS HEADER
#include "radio-button-impl.h"
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/text-actor.h>
+#include <dali/integration-api/debug.h>
#include <dali/public-api/object/type-registry.h>
-#include <dali/public-api/scripting/scripting.h>
-using namespace Dali;
-using namespace Dali::Toolkit::Internal;
+#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);
+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";
-
-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);
}
RadioButton::RadioButton()
- : mSelected(false)
{
- mUnselectedImage = Dali::Image::New( UNSELECTED_BUTTON_IMAGE_DIR );
- mSelectedImage = Dali::Image::New( SELECTED_BUTTON_IMAGE_DIR );
-
- mRadioIcon = Dali::ImageActor::New( mUnselectedImage );
+ SetTogglableButton(true);
}
RadioButton::~RadioButton()
{
}
-void RadioButton::SetLabel(const std::string& label)
+void RadioButton::OnInitialize()
{
- TextActor textActor = TextActor::DownCast( mLabel );
- if( textActor )
- {
- textActor.SetText( label );
- }
- else
- {
- Toolkit::TextView newTextView = Toolkit::TextView::New( label );
- SetLabel( newTextView );
- }
+ Button::OnInitialize();
- RelayoutRequest();
+ DevelControl::SetAccessibilityConstructor(Self(), [](Dali::Actor actor) {
+ return std::unique_ptr<Dali::Accessibility::Accessible>(
+ new AccessibleImpl(actor, Dali::Accessibility::Role::RADIO_BUTTON));
+ });
}
-void RadioButton::SetLabel(Actor label)
+bool RadioButton::OnToggleReleased()
{
- if( mLabel != label )
- {
- if( mLabel )
- {
- mRadioIcon.Remove( mLabel );
- }
-
- if( label )
- {
- label.SetParentOrigin( ParentOrigin::CENTER_RIGHT );
- label.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
- label.MoveBy( DISTANCE_BETWEEN_IMAGE_AND_LABEL );
- mRadioIcon.Add( label );
- }
-
- mLabel = label;
-
- RelayoutRequest();
- }
+ // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly.
+ return false;
}
-Actor RadioButton::GetLabel() const
+void RadioButton::OnStateChange(State newState)
{
- return mLabel;
-}
+ // 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);
-void RadioButton::SetSelected(bool selected)
-{
- if( mSelected != selected )
+ if(SELECTED_STATE == newState)
{
- if( selected )
+ Actor parent = Self().GetParent();
+ if(parent)
{
- Actor parent = Self().GetParent();
- if( parent )
+ for(unsigned int i = 0; i < parent.GetChildCount(); ++i)
{
- for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
+ Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast(parent.GetChildAt(i));
+ if(radioButtonChild && radioButtonChild != Self())
{
- Dali::Toolkit::RadioButton rbChild = Dali::Toolkit::RadioButton::DownCast(parent.GetChildAt(i));
-
- if( rbChild )
- {
- rbChild.SetSelected(false);
- }
+ radioButtonChild.SetProperty(Toolkit::Button::Property::SELECTED, false);
}
}
-
- mSelected = true;
- mRadioIcon.SetImage(mSelectedImage);
- }
- else
- {
- mSelected = false;
- mRadioIcon.SetImage(mUnselectedImage);
}
-
- // Raise state changed signal
- Toolkit::RadioButton handle( GetOwner() );
- mStateChangedSignal.Emit( handle, mSelected );
-
- RelayoutRequest();
}
-}
-
-bool RadioButton::IsSelected()const
-{
- return mSelected;
-}
-
-void RadioButton::ToggleState()
-{
- SetSelected(!mSelected);
-}
-
-void RadioButton::OnRelayout( const Vector2& /*size*/, ActorSizeContainer& container )
-{
- Vector3 newSize( mRadioIcon.GetNaturalSize() );
-
- if( mLabel )
+ // 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))
{
- // 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( mLabel.GetNaturalSize() );
- Control::Relayout( mLabel, Vector2( actorNaturalSize.width, actorNaturalSize.height ), container );
-
- Vector3 actorSize( mLabel.GetSize() );
- newSize.width += actorSize.width;
- newSize.height = std::max( newSize.height, actorSize.height );
+ Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(
+ Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
}
-
- Self().SetSize( newSize );
-}
-
-void RadioButton::OnInitialize()
-{
- mRadioIcon.SetAnchorPoint( AnchorPoint::CENTER_LEFT );
- mRadioIcon.SetParentOrigin( ParentOrigin::CENTER_LEFT );
- Self().Add( mRadioIcon );
-
- RelayoutRequest();
}
-void RadioButton::OnButtonUp()
+Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
{
- // Don't allow selection on an already selected radio button
- if( !mSelected )
- {
- ToggleState();
- }
+ auto tmp = Button::AccessibleImpl::CalculateStates();
+ auto slf = Toolkit::Button::DownCast(Self());
+ if(slf.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
+ tmp[Dali::Accessibility::State::CHECKED] = true;
+ tmp[Dali::Accessibility::State::SELECTABLE] = true;
+ return tmp;
}
-void RadioButton::SetProperty(BaseObject* object, Property::Index propertyIndex, const Property::Value& value)
-{
- Toolkit::RadioButton radioButton = Toolkit::RadioButton::DownCast( Dali::BaseHandle( object ) );
+} // namespace Internal
- if( radioButton )
- {
- RadioButton& radioButtonImpl( GetImplementation( radioButton ) );
+} // namespace Toolkit
- if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
- {
- radioButtonImpl.SetSelected( value.Get< bool >( ) );
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
- {
- radioButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >( ) ) );
- }
- }
-}
-
-Property::Value RadioButton::GetProperty(BaseObject* object, Property::Index propertyIndex)
-{
- Property::Value value;
-
- Toolkit::RadioButton radioButton = Toolkit::RadioButton::DownCast( Dali::BaseHandle(object) );
-
- if( radioButton )
- {
- RadioButton& radioButtonImpl( GetImplementation( radioButton ) );
-
- if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED )
- {
- value = radioButtonImpl.mSelected;
- }
- else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR )
- {
- Property::Map map;
- Scripting::CreatePropertyMap( radioButtonImpl.mLabel, map );
- value = map;
- }
- }
-
- return value;
-}
+} // namespace Dali