X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fbutton-impl.cpp;h=f8b0fb295bc67871ec86ef766d9f02675b50b901;hp=28b9d4a65a00189a7827d43d8cdbac71c6bad975;hb=18644a10e91e667563734dfa9fa8be6b85ffdc51;hpb=8269fc656ce5c08314e340932c2af762e7234628 diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 28b9d4a..f8b0fb2 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -30,6 +30,7 @@ // INTERNAL INCLUDES #include #include +#include /** * Button states and contents @@ -77,32 +78,35 @@ BaseHandle Create() DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Button, Toolkit::Control, Create ); DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled", BOOLEAN, DISABLED ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "auto-repeating", BOOLEAN, AUTO_REPEATING ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initial-auto-repeating-delay", FLOAT, INITIAL_AUTO_REPEATING_DELAY ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "next-auto-repeating-delay", FLOAT, NEXT_AUTO_REPEATING_DELAY ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "autoRepeating", BOOLEAN, AUTO_REPEATING ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "initialAutoRepeatingDelay", FLOAT, INITIAL_AUTO_REPEATING_DELAY ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "nextAutoRepeatingDelay", FLOAT, NEXT_AUTO_REPEATING_DELAY ) DALI_PROPERTY_REGISTRATION( Toolkit, Button, "togglable", BOOLEAN, TOGGLABLE ) DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected", BOOLEAN, SELECTED ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselected-state-image", STRING, UNSELECTED_STATE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected-state-image", STRING, SELECTED_STATE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabled-state-image", STRING, DISABLED_STATE_IMAGE ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselected-color", VECTOR4, UNSELECTED_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selected-color", VECTOR4, SELECTED_COLOR ) -DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label-text", STRING, LABEL_TEXT ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedStateImage", STRING, UNSELECTED_STATE_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedStateImage", STRING, SELECTED_STATE_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "disabledStateImage", STRING, DISABLED_STATE_IMAGE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "unselectedColor", VECTOR4, UNSELECTED_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "selectedColor", VECTOR4, SELECTED_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "label", MAP, LABEL ) +// Deprecated properties: +DALI_PROPERTY_REGISTRATION( Toolkit, Button, "labelText", STRING, LABEL_TEXT ) + +// Signals: DALI_SIGNAL_REGISTRATION( Toolkit, Button, "pressed", SIGNAL_PRESSED ) DALI_SIGNAL_REGISTRATION( Toolkit, Button, "released", SIGNAL_RELEASED ) DALI_SIGNAL_REGISTRATION( Toolkit, Button, "clicked", SIGNAL_CLICKED ) -DALI_SIGNAL_REGISTRATION( Toolkit, Button, "state-changed", SIGNAL_STATE_CHANGED ) +DALI_SIGNAL_REGISTRATION( Toolkit, Button, "stateChanged", SIGNAL_STATE_CHANGED ) -DALI_ACTION_REGISTRATION( Toolkit, Button, "button-click", ACTION_BUTTON_CLICK ) +// Actions: +DALI_ACTION_REGISTRATION( Toolkit, Button, "buttonClick", ACTION_BUTTON_CLICK ) DALI_TYPE_REGISTRATION_END() const unsigned int INITIAL_AUTOREPEATING_DELAY( 0.15f ); const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f ); -const char* const STYLE_BUTTON_LABEL = "button.label"; - } // unnamed namespace Button::Button() @@ -428,27 +432,9 @@ float Button::GetAnimationTime() const void Button::SetLabelText( const std::string& label ) { - if( !mLabel || ( label != GetLabelText() ) ) - { - // If we have a label, unparent and update it. - if( mLabel ) - { - mLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, label ); - } - else - { - // If we don't have a label, create one and set it up. - mLabel = Toolkit::TextLabel::New( label ); - mLabel.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_LABEL ); - mLabel.SetPosition( 0.f, 0.f ); - // label should be the top of the button - Self().Add( mLabel ); - } - - OnLabelSet(); - - RelayoutRequest(); - } + Property::Map labelProperty; + labelProperty.Insert( "text", label ); + ModifyLabel( labelProperty ); } std::string Button::GetLabelText() const @@ -461,6 +447,40 @@ std::string Button::GetLabelText() const return std::string(); } +void Button::ModifyLabel( const Property::Map& properties ) +{ + // If we don't have a label yet, create one. + if( !mLabel ) + { + // If we don't have a label, create one and set it up. + // Note: The label text is set from the passed in property map after creation. + mLabel = Toolkit::TextLabel::New(); + mLabel.SetPosition( 0.0f, 0.0f ); + // label should be the top of the button + Self().Add( mLabel ); + } + + // Set any properties specified for the label by iterating through all property key-value pairs. + for( unsigned int i = 0, mapCount = properties.Count(); i < mapCount; ++i ) + { + const StringValuePair& propertyPair( properties.GetPair( i ) ); + + // Convert the property string to a property index. + Property::Index setPropertyIndex = mLabel.GetPropertyIndex( propertyPair.first ); + if( setPropertyIndex != Property::INVALID_INDEX ) + { + // If the conversion worked, we have a valid property index, + // Set the property to the new value. + mLabel.SetProperty( setPropertyIndex, propertyPair.second ); + } + } + + // Notify derived button classes of the change. + OnLabelSet( false ); + + RelayoutRequest(); +} + Actor& Button::GetLabelActor() { return mLabel; @@ -555,18 +575,14 @@ const Vector4 Button::GetSelectedColor() const void Button::SetUnselectedImage( const std::string& filename ) { - ImageActor newContent; + Toolkit::ImageView newContent; if( !filename.empty() ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - newContent = ImageActor::New( resourceimage ); - } + newContent = Toolkit::ImageView::New( filename ); } else { - newContent = ImageActor::New(); + newContent = Toolkit::ImageView::New(); } if( newContent ) @@ -587,18 +603,14 @@ Actor& Button::GetUnselectedImage() void Button::SetSelectedImage( const std::string& filename ) { - ImageActor newContent; + Toolkit::ImageView newContent; if( !filename.empty() ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - newContent = ImageActor::New( resourceimage ); - } + newContent = Toolkit::ImageView::New( filename ); } else { - newContent = ImageActor::New(); + newContent = Toolkit::ImageView::New(); } if( newContent ) @@ -619,14 +631,10 @@ Actor& Button::GetSelectedImage() void Button::SetBackgroundImage( const std::string& filename ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mBackgroundContent, ImageActor::New( resourceimage ) ); + SetupContent( mBackgroundContent, Toolkit::ImageView::New( filename ) ); - OnBackgroundImageSet(); - RelayoutRequest(); - } + OnBackgroundImageSet(); + RelayoutRequest(); } Actor& Button::GetBackgroundImage() @@ -636,14 +644,10 @@ Actor& Button::GetBackgroundImage() void Button::SetSelectedBackgroundImage( const std::string& filename ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mSelectedBackgroundContent, ImageActor::New( resourceimage ) ); + SetupContent( mSelectedBackgroundContent, Toolkit::ImageView::New( filename ) ); - OnSelectedBackgroundImageSet(); - RelayoutRequest(); - } + OnSelectedBackgroundImageSet(); + RelayoutRequest(); } Actor& Button::GetSelectedBackgroundImage() @@ -653,14 +657,10 @@ Actor& Button::GetSelectedBackgroundImage() void Button::SetDisabledImage( const std::string& filename ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mDisabledContent, ImageActor::New( resourceimage ) ); + SetupContent( mDisabledContent, Toolkit::ImageView::New( filename ) ); - OnDisabledImageSet(); - RelayoutRequest(); - } + OnDisabledImageSet(); + RelayoutRequest(); } Actor& Button::GetDisabledImage() @@ -670,14 +670,10 @@ Actor& Button::GetDisabledImage() void Button::SetDisabledSelectedImage( const std::string& filename ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mDisabledSelectedContent, ImageActor::New( resourceimage ) ); + SetupContent( mDisabledSelectedContent, Toolkit::ImageView::New( filename ) ); - OnDisabledSelectedImageSet(); - RelayoutRequest(); - } + OnDisabledSelectedImageSet(); + RelayoutRequest(); } Actor& Button::GetDisabledSelectedImage() @@ -687,14 +683,10 @@ Actor& Button::GetDisabledSelectedImage() void Button::SetDisabledBackgroundImage( const std::string& filename ) { - Image resourceimage = Dali::ResourceImage::New( filename ); - if( resourceimage ) - { - SetupContent( mDisabledBackgroundContent, ImageActor::New( resourceimage ) ); + SetupContent( mDisabledBackgroundContent, Toolkit::ImageView::New( filename ) ); - OnDisabledBackgroundImageSet(); - RelayoutRequest(); - } + OnDisabledBackgroundImageSet(); + RelayoutRequest(); } Actor& Button::GetDisabledBackgroundImage() @@ -1179,7 +1171,6 @@ void Button::PrepareAddButtonImage( Actor& actor ) { if( actor ) { - actor.Unparent(); Self().Add( actor ); PrepareForTranstionOut( actor ); } @@ -1202,7 +1193,6 @@ void Button::AddButtonImage( Actor& actor ) { if( actor ) { - actor.Unparent(); Self().Add( actor ); } } @@ -1468,6 +1458,17 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope GetImplementation( button ).SetLabelText( value.Get< std::string >() ); break; } + + case Toolkit::Button::Property::LABEL: + { + // Get a Property::Map from the property if possible. + Property::Map setPropertyMap; + if( value.Get( setPropertyMap ) ) + { + GetImplementation( button ).ModifyLabel( setPropertyMap ); + } + } + break; } } } @@ -1553,6 +1554,13 @@ Property::Value Button::GetProperty( BaseObject* object, Property::Index propert value = GetImplementation( button ).GetLabelText(); break; } + + case Toolkit::Button::Property::LABEL: + { + Property::Map emptyMap; + value = emptyMap; + break; + } } } @@ -1571,13 +1579,13 @@ void Button::SetLabel( Actor label ) } mLabel = label; - mLabel.SetProperty( Toolkit::Control::Property::STYLE_NAME, STYLE_BUTTON_LABEL ); - mLabel.SetPosition( 0.f, 0.f ); + mLabel.SetPosition( 0.0f, 0.0f ); // label should be the top of the button Self().Add( mLabel ); - OnLabelSet(); + ResetImageLayers(); + OnLabelSet( true ); RelayoutRequest(); }