X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Fbuttons%2Fpush-button-impl.cpp;h=450b03858d6637977c100234c54213351676b6df;hp=4f87d38a58562e9ab0fb47311e999fba012bc268;hb=refs%2Ftags%2Fsubmit%2Ftizen%2F20150205.132635;hpb=00ef589046a32c53d20de1c61af7cc69524e51dc diff --git a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp index 4f87d38..450b038 100644 --- a/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp +++ b/base/dali-toolkit/internal/controls/buttons/push-button-impl.cpp @@ -1,29 +1,30 @@ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 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. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // CLASS HEADER - #include "push-button-impl.h" // EXTERNAL INCLUDES - #include +#include +#include +#include // INTERNAL INCLUDES - #include "push-button-default-painter-impl.h" #include @@ -35,16 +36,6 @@ namespace Dali namespace Toolkit { -const Property::Index PushButton::PROPERTY_AUTO_REPEATING = Internal::Button::BUTTON_PROPERTY_END_INDEX + 1; -const Property::Index PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_END_INDEX + 2; -const Property::Index PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY = Internal::Button::BUTTON_PROPERTY_END_INDEX + 3; -const Property::Index PushButton::PROPERTY_TOGGLABLE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 4; -const Property::Index PushButton::PROPERTY_TOGGLE = Internal::Button::BUTTON_PROPERTY_END_INDEX + 5; -const Property::Index PushButton::PROPERTY_NORMAL_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 6; -const Property::Index PushButton::PROPERTY_PRESSED_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 7; -const Property::Index PushButton::PROPERTY_DIMMED_STATE_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 8; -const Property::Index PushButton::PROPERTY_LABEL_ACTOR = Internal::Button::BUTTON_PROPERTY_END_INDEX + 9; - namespace Internal { @@ -58,22 +49,11 @@ BaseHandle Create() TypeRegistration typeRegistration( typeid(Toolkit::PushButton), typeid(Toolkit::Button), Create ); -SignalConnectorType signalConnector1( typeRegistration, Toolkit::PushButton::SIGNAL_TOGGLED , &PushButton::DoConnectSignal ); -SignalConnectorType signalConnector2( typeRegistration, Toolkit::PushButton::SIGNAL_PRESSED , &PushButton::DoConnectSignal ); -SignalConnectorType signalConnector3( typeRegistration, Toolkit::PushButton::SIGNAL_RELEASED, &PushButton::DoConnectSignal ); +SignalConnectorType signalConnector1( typeRegistration, Toolkit::PushButton::SIGNAL_PRESSED , &PushButton::DoConnectSignal ); +SignalConnectorType signalConnector2( typeRegistration, Toolkit::PushButton::SIGNAL_RELEASED, &PushButton::DoConnectSignal ); TypeAction action1( typeRegistration, Toolkit::PushButton::ACTION_PUSH_BUTTON_CLICK, &PushButton::DoAction ); -PropertyRegistration property1( typeRegistration, "auto-repeating", Toolkit::PushButton::PROPERTY_AUTO_REPEATING, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property2( typeRegistration, "initial-auto-repeating-delay", Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY, Property::FLOAT, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property3( typeRegistration, "next-auto-repeating-delay", Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY, Property::FLOAT, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property4( typeRegistration, "togglable", Toolkit::PushButton::PROPERTY_TOGGLABLE, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property5( typeRegistration, "toggle", Toolkit::PushButton::PROPERTY_TOGGLE, Property::BOOLEAN, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property6( typeRegistration, "normal-state-actor", Toolkit::PushButton::PROPERTY_NORMAL_STATE_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property7( typeRegistration, "pressed-state-actor", Toolkit::PushButton::PROPERTY_PRESSED_STATE_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property8( typeRegistration, "dimmed-state-actor", Toolkit::PushButton::PROPERTY_DIMMED_STATE_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty ); -PropertyRegistration property9( typeRegistration, "label-actor", Toolkit::PushButton::PROPERTY_LABEL_ACTOR, Property::MAP, &PushButton::SetProperty, &PushButton::GetProperty ); - } // unnamed namespace namespace @@ -198,7 +178,7 @@ bool PushButton::IsToggleButton() const void PushButton::SetToggled( bool toggle ) { - if( !mDimmed && mToggleButton && ( toggle != mToggled ) ) + if( !mDisabled && mToggleButton && ( toggle != mToggled ) ) { mToggled = toggle; @@ -208,7 +188,7 @@ void PushButton::SetToggled( bool toggle ) GetPushButtonPainter( mPainter )->Toggled( handle ); // Emit signal. - mToggledSignalV2.Emit( handle, mToggled ); + mStateChangedSignal.Emit( handle, mToggled ); } } @@ -259,88 +239,88 @@ Actor PushButton::GetBackgroundImage() const return mBackgroundImage; } -void PushButton::SetPressedImage( Image image ) +void PushButton::SetSelectedImage( Image image ) { - SetPressedImage( ImageActor::New( image ) ); + SetSelectedImage( ImageActor::New( image ) ); } -void PushButton::SetPressedImage( Actor image ) +void PushButton::SetSelectedImage( Actor image ) { Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetPressedImage( handle, image ); + GetPushButtonPainter( mPainter )->SetSelectedImage( handle, image ); } -Actor& PushButton::GetPressedImage() +Actor& PushButton::GetSelectedImage() { - return mPressedImage; + return mSelectedImage; } -Actor PushButton::GetPressedImage() const +Actor PushButton::GetSelectedImage() const { - return mPressedImage; + return mSelectedImage; } -void PushButton::SetDimmedBackgroundImage( Image image ) +void PushButton::SetDisabledBackgroundImage( Image image ) { - SetDimmedBackgroundImage( ImageActor::New( image ) ); + SetDisabledBackgroundImage( ImageActor::New( image ) ); } -void PushButton::SetDimmedBackgroundImage( Actor image ) +void PushButton::SetDisabledBackgroundImage( Actor image ) { Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetDimmedBackgroundImage( handle, image ); + GetPushButtonPainter( mPainter )->SetDisabledBackgroundImage( handle, image ); } -Actor& PushButton::GetDimmedBackgroundImage() +Actor& PushButton::GetDisabledBackgroundImage() { - return mDimmedBackgroundImage; + return mDisabledBackgroundImage; } -Actor PushButton::GetDimmedBackgroundImage() const +Actor PushButton::GetDisabledBackgroundImage() const { - return mDimmedBackgroundImage; + return mDisabledBackgroundImage; } -void PushButton::SetDimmedImage( Image image ) +void PushButton::SetDisabledImage( Image image ) { - SetDimmedImage( ImageActor::New( image ) ); + SetDisabledImage( ImageActor::New( image ) ); } -void PushButton::SetDimmedImage( Actor image ) +void PushButton::SetDisabledImage( Actor image ) { Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetDimmedImage( handle, image ); + GetPushButtonPainter( mPainter )->SetDisabledImage( handle, image ); } -Actor& PushButton::GetDimmedImage() +Actor& PushButton::GetDisabledImage() { - return mDimmedImage; + return mDisabledImage; } -Actor PushButton::GetDimmedImage() const +Actor PushButton::GetDisabledImage() const { - return mDimmedImage; + return mDisabledImage; } -void PushButton::SetLabelText( const std::string& text ) +void PushButton::SetLabel( const std::string& label ) { - Toolkit::TextView textView ( Toolkit::TextView::New( text ) ); + Toolkit::TextView textView ( Toolkit::TextView::New( label ) ); textView.SetWidthExceedPolicy( Toolkit::TextView::ShrinkToFit ); // Make sure our text always fits inside the button - SetLabelText( textView ); + SetLabel( textView ); } -void PushButton::SetLabelText( Actor text ) +void PushButton::SetLabel( Actor label ) { Toolkit::PushButton handle( GetOwner() ); - GetPushButtonPainter( mPainter )->SetLabelText( handle, text ); + GetPushButtonPainter( mPainter )->SetLabel( handle, label ); } -Actor& PushButton::GetLabel() +Actor PushButton::GetLabel() const { return mLabel; } -Actor PushButton::GetLabelText() const +Actor& PushButton::GetLabel() { return mLabel; } @@ -355,19 +335,14 @@ Actor& PushButton::GetFadeOutButtonImage() return mFadeOutButtonImage; } -Toolkit::PushButton::ToggledSignalV2& PushButton::ToggledSignal() +Toolkit::PushButton::PressedSignalType& PushButton::PressedSignal() { - return mToggledSignalV2; + return mPressedSignal; } -Toolkit::PushButton::PressedSignalV2& PushButton::PressedSignal() +Toolkit::PushButton::ReleasedSignalType& PushButton::ReleasedSignal() { - return mPressedSignalV2; -} - -Toolkit::PushButton::ReleasedSignalV2& PushButton::ReleasedSignal() -{ - return mReleasedSignalV2; + return mReleasedSignal; } bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) @@ -377,9 +352,9 @@ bool PushButton::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface bool connected( true ); Toolkit::PushButton button = Toolkit::PushButton::DownCast(handle); - if( Toolkit::PushButton::SIGNAL_TOGGLED == signalName ) + if( Toolkit::PushButton::SIGNAL_STATE_CHANGED == signalName ) { - button.ToggledSignal().Connect( tracker, functor ); + button.StateChangedSignal().Connect( tracker, functor ); } else if( Toolkit::PushButton::SIGNAL_PRESSED == signalName ) { @@ -406,61 +381,41 @@ void PushButton::SetProperty( BaseObject* object, Property::Index propertyIndex, { PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - switch ( propertyIndex ) + if ( propertyIndex == Toolkit::Button::PROPERTY_AUTO_REPEATING ) { - case Toolkit::PushButton::PROPERTY_AUTO_REPEATING: - { - pushButtonImpl.SetAutoRepeating( value.Get< bool >() ); - break; - } - - case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY: - { - pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() ); - break; - } - - case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY: - { - pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() ); - break; - } - - case Toolkit::PushButton::PROPERTY_TOGGLABLE: - { - pushButtonImpl.SetToggleButton( value.Get< bool >() ); - break; - } - - case Toolkit::PushButton::PROPERTY_TOGGLE: - { - pushButtonImpl.SetToggled( value.Get< bool >() ); - break; - } - - case Toolkit::PushButton::PROPERTY_NORMAL_STATE_ACTOR: - { - pushButtonImpl.SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) ); - break; - } - - case Toolkit::PushButton::PROPERTY_PRESSED_STATE_ACTOR: - { - pushButtonImpl.SetPressedImage( Scripting::NewActor( value.Get< Property::Map >() ) ); - break; - } - - case Toolkit::PushButton::PROPERTY_DIMMED_STATE_ACTOR: - { - pushButtonImpl.SetDimmedImage( Scripting::NewActor( value.Get< Property::Map >() ) ); - break; - } - - case Toolkit::PushButton::PROPERTY_LABEL_ACTOR: - { - pushButtonImpl.SetLabelText( Scripting::NewActor( value.Get< Property::Map >() ) ); - break; - } + pushButtonImpl.SetAutoRepeating( value.Get< bool >() ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY ) + { + pushButtonImpl.SetInitialAutoRepeatingDelay( value.Get< float >() ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY ) + { + pushButtonImpl.SetNextAutoRepeatingDelay( value.Get< float >() ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLABLE ) + { + pushButtonImpl.SetToggleButton( value.Get< bool >() ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED ) + { + pushButtonImpl.SetToggled( value.Get< bool >() ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR ) + { + pushButtonImpl.SetButtonImage( Scripting::NewActor( value.Get< Property::Map >() ) ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR ) + { + pushButtonImpl.SetSelectedImage( Scripting::NewActor( value.Get< Property::Map >() ) ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR ) + { + pushButtonImpl.SetDisabledImage( Scripting::NewActor( value.Get< Property::Map >() ) ); + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR ) + { + pushButtonImpl.SetLabel( Scripting::NewActor( value.Get< Property::Map >() ) ); } } } @@ -475,69 +430,49 @@ Property::Value PushButton::GetProperty( BaseObject* object, Property::Index pro { PushButton& pushButtonImpl( GetImplementation( pushButton ) ); - switch ( propertyIndex ) + if ( propertyIndex == Toolkit::Button::PROPERTY_AUTO_REPEATING ) { - case Toolkit::PushButton::PROPERTY_AUTO_REPEATING: - { - value = pushButtonImpl.mAutoRepeating; - break; - } - - case Toolkit::PushButton::PROPERTY_INITIAL_AUTO_REPEATING_DELAY: - { - value = pushButtonImpl.mInitialAutoRepeatingDelay; - break; - } - - case Toolkit::PushButton::PROPERTY_NEXT_AUTO_REPEATING_DELAY: - { - value = pushButtonImpl.mNextAutoRepeatingDelay; - break; - } - - case Toolkit::PushButton::PROPERTY_TOGGLABLE: - { - value = pushButtonImpl.mToggleButton; - break; - } - - case Toolkit::PushButton::PROPERTY_TOGGLE: - { - value = pushButtonImpl.mToggled; - break; - } - - case Toolkit::PushButton::PROPERTY_NORMAL_STATE_ACTOR: - { - Property::Map map; - Scripting::CreatePropertyMap( pushButtonImpl.mButtonImage, map ); - value = map; - break; - } - - case Toolkit::PushButton::PROPERTY_PRESSED_STATE_ACTOR: - { - Property::Map map; - Scripting::CreatePropertyMap( pushButtonImpl.mPressedImage, map ); - value = map; - break; - } - - case Toolkit::PushButton::PROPERTY_DIMMED_STATE_ACTOR: - { - Property::Map map; - Scripting::CreatePropertyMap( pushButtonImpl.mDimmedImage, map ); - value = map; - break; - } - - case Toolkit::PushButton::PROPERTY_LABEL_ACTOR: - { - Property::Map map; - Scripting::CreatePropertyMap( pushButtonImpl.mLabel, map ); - value = map; - break; - } + value = pushButtonImpl.mAutoRepeating; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_INITIAL_AUTO_REPEATING_DELAY ) + { + value = pushButtonImpl.mInitialAutoRepeatingDelay; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_NEXT_AUTO_REPEATING_DELAY ) + { + value = pushButtonImpl.mNextAutoRepeatingDelay; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLABLE ) + { + value = pushButtonImpl.mToggleButton; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_TOGGLED ) + { + value = pushButtonImpl.mToggled; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_NORMAL_STATE_ACTOR ) + { + Property::Map map; + Scripting::CreatePropertyMap( pushButtonImpl.mButtonImage, map ); + value = map; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_SELECTED_STATE_ACTOR ) + { + Property::Map map; + Scripting::CreatePropertyMap( pushButtonImpl.mSelectedImage, map ); + value = map; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_DISABLED_STATE_ACTOR ) + { + Property::Map map; + Scripting::CreatePropertyMap( pushButtonImpl.mDisabledImage, map ); + value = map; + } + else if ( propertyIndex == Toolkit::Button::PROPERTY_LABEL_ACTOR ) + { + Property::Map map; + Scripting::CreatePropertyMap( pushButtonImpl.mLabel, map ); + value = map; } } @@ -566,7 +501,7 @@ void PushButton::OnButtonDown() } //Emit signal. - mPressedSignalV2.Emit( handle ); + mPressedSignal.Emit( handle ); } } @@ -583,8 +518,8 @@ void PushButton::OnButtonUp() // Notifies the painter the button has been toggled. GetPushButtonPainter( mPainter )->Toggled( handle ); - //Emit signal. - mToggledSignalV2.Emit( handle, mToggled ); + // Emit signal. + mStateChangedSignal.Emit( handle, mToggled ); } else { @@ -600,8 +535,8 @@ void PushButton::OnButtonUp() } //Emit signal. - mReleasedSignalV2.Emit( handle ); - mClickedSignalV2.Emit( handle ); + mReleasedSignal.Emit( handle ); + mClickedSignal.Emit( handle ); } } } @@ -623,7 +558,7 @@ void PushButton::OnTouchPointLeave() } //Emit signal. - mReleasedSignalV2.Emit( handle ); + mReleasedSignal.Emit( handle ); } } } @@ -643,6 +578,25 @@ float PushButton::OnAnimationTimeRequested() const return GetPushButtonPainter( mPainter )->GetAnimationTime(); } +void PushButton::OnButtonStageDisconnection() +{ + if( ButtonDown == mState ) + { + if( !mToggleButton ) + { + Toolkit::PushButton handle( GetOwner() ); + + // Notifies the painter the button has been released. + GetPushButtonPainter( mPainter )->Released( handle ); + + if( mAutoRepeating ) + { + mAutoRepeatingTimer.Reset(); + } + } + } +} + PushButton::PushButton() : Button(), mAutoRepeating( false ), @@ -677,7 +631,7 @@ void PushButton::SetUpTimer( float delay ) bool PushButton::AutoRepeatingSlot() { bool consumed = false; - if( !mDimmed ) + if( !mDisabled ) { // Restart the autorepeat timer. SetUpTimer( mNextAutoRepeatingDelay ); @@ -688,9 +642,9 @@ bool PushButton::AutoRepeatingSlot() GetPushButtonPainter( mPainter )->Pressed( handle ); //Emit signal. - consumed = mReleasedSignalV2.Emit( handle ); - consumed |= mClickedSignalV2.Emit( handle ); - consumed |= mPressedSignalV2.Emit( handle ); + consumed = mReleasedSignal.Emit( handle ); + consumed |= mClickedSignal.Emit( handle ); + consumed |= mPressedSignal.Emit( handle ); } return consumed; @@ -699,7 +653,7 @@ bool PushButton::AutoRepeatingSlot() void PushButton::OnActivated() { // When the button is activated, it performs the click action - std::vector attributes; + PropertyValueContainer attributes; DoClickAction(attributes); } @@ -780,7 +734,7 @@ void PushButton::DoClickAction(const PropertyValueContainer& attributes) } } -bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const std::vector& attributes) +bool PushButton::DoAction(BaseObject* object, const std::string& actionName, const PropertyValueContainer& attributes) { bool ret = false;