*
*/
-
// 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 float DISTANCE_BETWEEN_IMAGE_AND_LABEL = 5.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::SetImage( Actor image )
+void RadioButton::OnInitialize()
{
- mLayoutContainer.RemoveChildAt( Toolkit::TableView::CellPosition( 0, 0 ) );
- mLayoutContainer.AddChild( image, Toolkit::TableView::CellPosition( 0, 0 ) );
+ 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::SetButtonImage( Actor image )
+bool RadioButton::OnToggleReleased()
{
- Actor& buttonImage = GetButtonImage();
- buttonImage = image;
+ // Radio button overrides toggle release (button up) as doesn't allow un-selection to be performed on it directly.
+ return false;
}
-void RadioButton::SetSelectedImage( Actor image )
+void RadioButton::OnStateChange(State newState)
{
- Actor& selectedImage = GetSelectedImage();
- selectedImage = image;
-}
+ // 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::OnButtonInitialize()
-{
- Actor self = Self();
-
- // Wrap size of radio button around all its children
- self.SetResizePolicy( FIT_TO_CHILDREN, ALL_DIMENSIONS );
-
- // Create the layout container empty at first
- mLayoutContainer = Toolkit::TableView::New( 0, 0 );
- mLayoutContainer.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- mLayoutContainer.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mLayoutContainer.SetResizePolicy( FIT_TO_CHILDREN, ALL_DIMENSIONS );
- self.Add( mLayoutContainer );
-
- 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 ) );
-
- SetImage( GetButtonImage() );
-
- RelayoutRequest();
-}
-
-void RadioButton::OnButtonUp()
-{
- if( ButtonDown == GetState() )
+ if(SELECTED_STATE == newState)
{
- // Don't allow selection on an already selected radio button
- if( !IsSelected() )
+ Actor parent = Self().GetParent();
+ if(parent)
{
- SetSelected( !IsSelected() );
+ for(unsigned int i = 0; i < parent.GetChildCount(); ++i)
+ {
+ Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast(parent.GetChildAt(i));
+ if(radioButtonChild && radioButtonChild != Self())
+ {
+ radioButtonChild.SetProperty(Toolkit::Button::Property::SELECTED, false);
+ }
+ }
}
}
-}
-
-void RadioButton::OnLabelSet()
-{
- Actor& label = GetLabel();
- if( 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))
{
- // Add padding to the left of the label to create distance from the image
- label.SetPadding( Padding( DISTANCE_BETWEEN_IMAGE_AND_LABEL, 0.0f, 0.0f, 0.0f ) );
-
- mLayoutContainer.RemoveChildAt( Toolkit::TableView::CellPosition( 0, 1 ) );
- mLayoutContainer.AddChild( label, Toolkit::TableView::CellPosition( 0, 1 ) );
+ Dali::Accessibility::Accessible::Get(Self())->EmitStateChanged(Dali::Accessibility::State::CHECKED, newState == SELECTED_STATE ? 1 : 0, 0);
}
}
-void RadioButton::OnSelected( bool selected )
+Dali::Accessibility::States RadioButton::AccessibleImpl::CalculateStates()
{
- if( selected )
- {
- Actor parent = Self().GetParent();
- if( parent )
- {
- for( unsigned int i = 0; i < parent.GetChildCount(); ++i )
- {
- Dali::Toolkit::RadioButton radioButtonChild = Dali::Toolkit::RadioButton::DownCast( parent.GetChildAt( i ) );
- if( radioButtonChild )
- {
- radioButtonChild.SetSelected( false );
- }
- }
- }
+ auto state = Button::AccessibleImpl::CalculateStates();
+ auto self = Toolkit::Button::DownCast(Self());
- SetImage( GetSelectedImage() );
- }
- else
+ if(self.GetProperty<bool>(Toolkit::Button::Property::SELECTED))
{
- SetImage( GetButtonImage() );
+ state[Dali::Accessibility::State::CHECKED] = true;
}
+
+ state[Dali::Accessibility::State::SELECTABLE] = true;
+ return state;
}
} // namespace Internal