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=53ccf416bf2426e9926060f51262cbd27ce68ecc;hp=4548ac94b9e8ebbf78583bea9770657a76f2f991;hb=e14d00568eab69d46e78db427d91e33513fd662b;hpb=f3da11c2818c6d17706fbb2417f21b602b3190f5 diff --git a/dali-toolkit/internal/controls/buttons/button-impl.cpp b/dali-toolkit/internal/controls/buttons/button-impl.cpp index 4548ac9..53ccf41 100644 --- a/dali-toolkit/internal/controls/buttons/button-impl.cpp +++ b/dali-toolkit/internal/controls/buttons/button-impl.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * Copyright (c) 2016 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -20,16 +20,18 @@ // EXTERNAL INCLUDES #include // for strcmp -#include +#include #include #include -#include -#include +#include #include // INTERNAL INCLUDES -#include #include +#include +#include +#include + /** * Button states and contents @@ -109,7 +111,7 @@ const unsigned int NEXT_AUTOREPEATING_DELAY( 0.05f ); } // unnamed namespace Button::Button() -: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), +: Control( ControlBehaviour( REQUIRES_STYLE_CHANGE_SIGNALS ) ), mAutoRepeatingTimer(), mUnselectedColor( Color::WHITE ), // The natural colors of the specified images will be used by default. mSelectedColor( Color::WHITE ), @@ -528,42 +530,57 @@ void Button::SetupContent( Actor& actorToModify, Actor newActor ) } } -void Button::SetUnselectedColor( const Vector4& color ) -{ - mUnselectedColor = color; - - if( mUnselectedContent && !GetUnselectedImageFilename().empty() ) - { - // If there is existing unselected content, change the color on it directly. - mUnselectedContent.SetColor( mUnselectedColor ); - } - else - { - // If there is no existing content, create a new actor to use for flat color. - SetupContent( mUnselectedContent, CreateSolidColorActor( mUnselectedColor ) ); - mUnselectedContent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); - } -} - const Vector4 Button::GetUnselectedColor() const { return mUnselectedColor; } -void Button::SetSelectedColor( const Vector4& color ) +void Button::SetColor( const Vector4& color, Button::PaintState selectedState ) { - mSelectedColor = color; + Actor* contentActor = NULL; // Using a pointer as SetupContent assigns the new Actor to this. + bool imageFileExists = false; + Property::Index visualIndex = Toolkit::Button::Property::SELECTED_STATE_IMAGE; - if( mSelectedContent && !GetSelectedImageFilename().empty() ) + if ( selectedState == SelectedState || selectedState == DisabledSelectedState ) { - // If there is existing unselected content, change the color on it directly. - mSelectedContent.SetColor( mSelectedColor ); + mSelectedColor = color; + contentActor = &mSelectedContent; + imageFileExists = !GetSelectedImageFilename().empty(); } else { - // If there is no existing content, create a new actor to use for flat color. - SetupContent( mSelectedContent, CreateSolidColorActor( mSelectedColor ) ); - mSelectedContent.SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + mUnselectedColor = color; + contentActor = &mUnselectedContent; + imageFileExists = !GetUnselectedImageFilename().empty(); + visualIndex = Toolkit::Button::Property::UNSELECTED_STATE_IMAGE; + } + + if ( contentActor ) + { + if( imageFileExists ) + { + // If there is existing unselected content, change the color on it directly. + contentActor->SetColor( color ); + } + else + { + // If there is no existing content, create a new actor to use for flat color. + Actor placementActor = Actor::New(); + Toolkit::VisualFactory visualFactory = Toolkit::VisualFactory::Get(); + Toolkit::Visual::Base visual; + + Property::Map map; + map[ Toolkit::Visual::Property::TYPE ] = Toolkit::Visual::COLOR; + map[ Toolkit::ColorVisual::Property::MIX_COLOR ] = color; + + visual = visualFactory.CreateVisual( map ); + + RegisterVisual( visualIndex, placementActor, visual ); + visual.SetOnStage( placementActor ); + + SetupContent( *contentActor, placementActor ); // + contentActor->SetResizePolicy( ResizePolicy::FILL_TO_PARENT, Dimension::ALL_DIMENSIONS ); + } } } @@ -574,18 +591,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 ) @@ -606,18 +619,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 ) @@ -638,14 +647,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() @@ -655,14 +660,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() @@ -672,14 +673,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() @@ -689,14 +686,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() @@ -706,14 +699,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() @@ -747,32 +736,6 @@ std::string Button::GetSelectedImageFilename() const return std::string(); } -std::string Button::GetBackgroundImageFilename() const -{ - if( mBackgroundContent ) - { - ResourceImage image = ResourceImage::DownCast( mBackgroundContent ); - if( image ) - { - return image.GetUrl(); - } - } - return std::string(); -} - -std::string Button::GetSelectedBackgroundImageFilename() const -{ - if( mSelectedBackgroundContent ) - { - ResourceImage image = ResourceImage::DownCast( mSelectedBackgroundContent ); - if( image ) - { - return image.GetUrl(); - } - } - return std::string(); -} - std::string Button::GetDisabledImageFilename() const { if( mDisabledContent ) @@ -786,32 +749,6 @@ std::string Button::GetDisabledImageFilename() const return std::string(); } -std::string Button::GetDisabledSelectedImageFilename() const -{ - if( mDisabledSelectedContent ) - { - ResourceImage image = ResourceImage::DownCast( mDisabledSelectedContent ); - if( image ) - { - return image.GetUrl(); - } - } - return std::string(); -} - -std::string Button::GetDisabledBackgroundImageFilename() const -{ - if( mDisabledBackgroundContent ) - { - ResourceImage image = ResourceImage::DownCast( mDisabledBackgroundContent ); - if( image ) - { - return image.GetUrl(); - } - } - return std::string(); -} - bool Button::DoAction( BaseObject* object, const std::string& actionName, const Property::Map& attributes ) { bool ret = false; @@ -848,22 +785,6 @@ bool Button::DoClickAction( const Property::Map& attributes ) return false; } -void Button::OnButtonStageDisconnection() -{ - if( ButtonDown == mState ) - { - if( !mTogglableButton ) - { - Released(); - - if( mAutoRepeating ) - { - mAutoRepeatingTimer.Reset(); - } - } - } -} - void Button::OnButtonDown() { if( !mTogglableButton ) @@ -983,15 +904,62 @@ bool Button::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tr return connected; } -bool Button::OnTouchEvent(const TouchEvent& event) +void Button::OnInitialize() +{ + Actor self = Self(); + + mTapDetector = TapGestureDetector::New(); + mTapDetector.Attach( self ); + mTapDetector.DetectedSignal().Connect(this, &Button::OnTap); + + self.SetKeyboardFocusable( true ); + + self.TouchSignal().Connect( this, &Button::OnTouch ); +} + +bool Button::OnAccessibilityActivated() +{ + return OnKeyboardEnter(); +} + +bool Button::OnKeyboardEnter() +{ + // When the enter key is pressed, or button is activated, the click action is performed. + Property::Map attributes; + bool ret = DoClickAction( attributes ); + + return ret; +} + +void Button::OnStageDisconnection() +{ + if( ButtonDown == mState ) + { + if( !mTogglableButton ) + { + Released(); + + if( mAutoRepeating ) + { + mAutoRepeatingTimer.Reset(); + } + } + } + + mState = ButtonUp; + + Control::OnStageDisconnection(); +} + +bool Button::OnTouch( Actor actor, const TouchData& touch ) { // Only events are processed when the button is not disabled and the touch event has only // one touch point. - if( ( !mDisabled ) && ( 1 == event.GetPointCount() ) ) + if( ( !mDisabled ) && ( 1 == touch.GetPointCount() ) ) { - switch( event.GetPoint(0).state ) + switch( touch.GetState( 0 ) ) { - case TouchPoint::Down: + case PointState::DOWN: { OnButtonDown(); // Notification for derived classes. @@ -999,7 +967,7 @@ bool Button::OnTouchEvent(const TouchEvent& event) mState = ButtonDown; break; } - case TouchPoint::Up: + case PointState::UP: { OnButtonUp(); // Notification for derived classes. @@ -1007,7 +975,7 @@ bool Button::OnTouchEvent(const TouchEvent& event) mState = ButtonUp; break; } - case TouchPoint::Interrupted: + case PointState::INTERRUPTED: { OnTouchPointInterrupted(); // Notification for derived classes. @@ -1015,7 +983,7 @@ bool Button::OnTouchEvent(const TouchEvent& event) mState = ButtonUp; break; } - case TouchPoint::Leave: + case PointState::LEAVE: { OnTouchPointLeave(); // Notification for derived classes. @@ -1023,20 +991,15 @@ bool Button::OnTouchEvent(const TouchEvent& event) mState = ButtonUp; break; } - case TouchPoint::Motion: - case TouchPoint::Stationary: // FALLTHROUGH + case PointState::MOTION: + case PointState::STATIONARY: // FALLTHROUGH { // Nothing to do break; } - default: - { - DALI_ASSERT_ALWAYS( !"Point status unhandled." ); - break; - } } } - else if( 1 < event.GetPointCount() ) + else if( 1 < touch.GetPointCount() ) { OnTouchPointLeave(); // Notification for derived classes. @@ -1047,39 +1010,6 @@ bool Button::OnTouchEvent(const TouchEvent& event) return false; } -void Button::OnInitialize() -{ - Actor self = Self(); - - mTapDetector = TapGestureDetector::New(); - mTapDetector.Attach( self ); - mTapDetector.DetectedSignal().Connect(this, &Button::OnTap); - - OnButtonInitialize(); - - self.SetKeyboardFocusable( true ); -} - -bool Button::OnAccessibilityActivated() -{ - return OnKeyboardEnter(); -} - -bool Button::OnKeyboardEnter() -{ - // When the enter key is pressed, or button is activated, the click action is performed. - Property::Map attributes; - bool ret = DoClickAction( attributes ); - - return ret; -} - -void Button::OnControlStageDisconnection() -{ - OnButtonStageDisconnection(); // Notification for derived classes. - mState = ButtonUp; -} - void Button::OnTap(Actor actor, const TapGesture& tap) { // Do nothing. @@ -1198,7 +1128,6 @@ void Button::PrepareAddButtonImage( Actor& actor ) { if( actor ) { - actor.Unparent(); Self().Add( actor ); PrepareForTranstionOut( actor ); } @@ -1221,7 +1150,6 @@ void Button::AddButtonImage( Actor& actor ) { if( actor ) { - actor.Unparent(); Self().Add( actor ); } } @@ -1472,13 +1400,13 @@ void Button::SetProperty( BaseObject* object, Property::Index index, const Prope case Toolkit::Button::Property::UNSELECTED_COLOR: { - GetImplementation( button ).SetUnselectedColor( value.Get< Vector4 >() ); + GetImplementation( button ).SetColor( value.Get< Vector4 >(), UnselectedState ); break; } case Toolkit::Button::Property::SELECTED_COLOR: { - GetImplementation( button ).SetSelectedColor( value.Get< Vector4 >() ); + GetImplementation( button ).SetColor( value.Get< Vector4 >(), SelectedState ); break; }