X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Fcontrols%2Fslider%2Fslider-impl.cpp;h=7ab8438ff341d2813a6e67f8c542f42404eee781;hp=6462e0ce39b728d717b703e75fba28a47a307229;hb=f5b98922d42457ef4e33c05dc1fb612fa24e888f;hpb=e2eda444afbe82e9591fe198eef339227f90a616 diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 6462e0c..7ab8438 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -1,26 +1,34 @@ -// -// 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 -#include +// EXTERNAL INCLUDES #include +#include +#include +#include +#include + +// INTERNAL INCLUDES +#include using namespace Dali; -using namespace std; namespace Dali { @@ -31,8 +39,43 @@ namespace Toolkit namespace Internal { -namespace +namespace // Unnamed namespace { + +BaseHandle Create() +{ + return Dali::Toolkit::Slider::New(); +} + +// Setup properties, signals and actions using the type-registry. +DALI_TYPE_REGISTRATION_BEGIN( Toolkit::Slider, Toolkit::Control, Create ) + +DALI_PROPERTY_REGISTRATION( Slider, "lower-bound", FLOAT, LOWER_BOUND ) +DALI_PROPERTY_REGISTRATION( Slider, "upper-bound", FLOAT, UPPER_BOUND ) +DALI_PROPERTY_REGISTRATION( Slider, "value", FLOAT, VALUE ) +DALI_PROPERTY_REGISTRATION( Slider, "hit-region", VECTOR2, HIT_REGION ) +DALI_PROPERTY_REGISTRATION( Slider, "backing-region", VECTOR2, BACKING_REGION ) +DALI_PROPERTY_REGISTRATION( Slider, "handle-region", VECTOR2, HANDLE_REGION ) +DALI_PROPERTY_REGISTRATION( Slider, "backing-image-name", STRING, BACKING_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Slider, "handle-image-name", STRING, HANDLE_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Slider, "progress-image-name", STRING, PROGRESS_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Slider, "popup-image-name", STRING, POPUP_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Slider, "popup-arrow-image-name", STRING, POPUP_ARROW_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Slider, "disable-color", VECTOR4, DISABLE_COLOR ) +DALI_PROPERTY_REGISTRATION( Slider, "popup-text-color", VECTOR4, POPUP_TEXT_COLOR ) +DALI_PROPERTY_REGISTRATION( Slider, "value-precision", INTEGER, VALUE_PRECISION ) +DALI_PROPERTY_REGISTRATION( Slider, "show-popup", BOOLEAN, SHOW_POPUP ) +DALI_PROPERTY_REGISTRATION( Slider, "show-value", BOOLEAN, SHOW_VALUE ) +DALI_PROPERTY_REGISTRATION( Slider, "enabled", BOOLEAN, ENABLED ) +DALI_PROPERTY_REGISTRATION( Slider, "marks", ARRAY, MARKS ) +DALI_PROPERTY_REGISTRATION( Slider, "snap-to-marks", BOOLEAN, SNAP_TO_MARKS ) +DALI_PROPERTY_REGISTRATION( Slider, "mark-tolerance", FLOAT, MARK_TOLERANCE ) + +DALI_SIGNAL_REGISTRATION( Slider, "value-changed", SIGNAL_VALUE_CHANGED ) +DALI_SIGNAL_REGISTRATION( Slider, "mark", SIGNAL_MARK ) + +DALI_TYPE_REGISTRATION_END() + const float BACKING_Z = -0.1f; const float PROGRESS_Z = 0.1f; const float HANDLE_Z = 1.0f; @@ -52,16 +95,12 @@ const float DEFAULT_HEIGHT = 27.0f; const float DEFAULT_HIT_HEIGHT = 72.0f; const float DEFAULT_HANDLE_HEIGHT = DEFAULT_HIT_HEIGHT; -const char* SKINNED_BACKING_IMAGE_NAME = DALI_IMAGE_DIR "slider-skin.png"; +const char* SKINNED_BACKING_IMAGE_NAME = DALI_IMAGE_DIR "slider-skin.9.png"; const char* SKINNED_HANDLE_IMAGE_NAME = DALI_IMAGE_DIR "slider-skin-handle.png";; -const char* SKINNED_PROGRESS_IMAGE_NAME = DALI_IMAGE_DIR "slider-skin-progress.png"; -const char* SKINNED_POPUP_IMAGE_NAME = DALI_IMAGE_DIR "slider-popup.png"; +const char* SKINNED_PROGRESS_IMAGE_NAME = DALI_IMAGE_DIR "slider-skin-progress.9.png"; +const char* SKINNED_POPUP_IMAGE_NAME = DALI_IMAGE_DIR "slider-popup.9.png"; const char* SKINNED_POPUP_ARROW_IMAGE_NAME = DALI_IMAGE_DIR "slider-popup-arrow.png"; -const Vector4 SKINNED_BACKING_SCALE9_BORDER( 12.0f, 0.0f, 12.0f, 0.0f ); -const Vector4 SKINNED_PROGRESS_SCALE9_BORDER( 14.0f, 0.0f, 0.0f, 0.0f ); -const Vector4 SKINNED_POPUP_SCALE9_BORDER( 10.0f, 10.0f, 10.0f, 10.0f ); - const Vector2 DEFAULT_HIT_REGION( DEFAULT_WIDTH, DEFAULT_HIT_HEIGHT ); const Vector2 DEFAULT_BACKING_REGION( DEFAULT_WIDTH, DEFAULT_HEIGHT ); const Vector2 DEFAULT_HANDLE_REGION( DEFAULT_HANDLE_HEIGHT, DEFAULT_HANDLE_HEIGHT ); @@ -81,19 +120,9 @@ const int DEFAULT_VALUE_PRECISION = 0; const bool DEFAULT_SHOW_POPUP = false; const bool DEFAULT_SHOW_VALUE = true; const bool DEFAULT_ENABLED = true; +const bool DEFAULT_SNAP_TO_MARKS = false; - -BaseHandle Create() -{ - return Dali::Toolkit::Slider::New(); -} - -TypeRegistration typeRegistration( typeid(Dali::Toolkit::Slider), typeid(Dali::Toolkit::Control), Create ); - -SignalConnectorType signalConnector1( typeRegistration, Toolkit::Slider::SIGNAL_VALUE_CHANGED, &Toolkit::Internal::Slider::DoConnectSignal ); -SignalConnectorType signalConnector2( typeRegistration, Toolkit::Slider::SIGNAL_MARK, &Toolkit::Internal::Slider::DoConnectSignal ); - -} // namespace +} // Unnamed namespace /////////////////////////////////////////////////////////////////////////////////////////////////// // Slider @@ -115,8 +144,21 @@ Dali::Toolkit::Slider Slider::New() } Slider::Slider() -: ControlImpl( true ), - mState( NORMAL ) +: Control( ControlBehaviour( REQUIRES_TOUCH_EVENTS | REQUIRES_STYLE_CHANGE_SIGNALS ) ), + mState( NORMAL ), + mDisableColor( 0.0f, 0.0f, 0.0f, 0.0f ), + mPopupTextColor( 0.0f, 0.0f, 0.0f, 0.0f ), + mHitRegion( 0.0f, 0.0f ), + mBackingRegion( 0.0f, 0.0f ), + mHandleRegionSize( 0.0f, 0.0f ), + mLowerBound( 0.0f ), + mUpperBound( 0.0f ), + mValue( 0.0f ), + mMarkTolerance( 0.0f ), + mValuePrecision( 0 ), + mShowPopup( false ), + mShowValue( false ), + mSnapToMarks( false ) { } @@ -132,58 +174,33 @@ void Slider::OnInitialize() // Properties Actor self = Self(); - // Register properties in a block so the properties are ready for the update functions - mPropertyHitRegion = self.RegisterProperty( Dali::Toolkit::Slider::HIT_REGION_PROPERTY_NAME, DEFAULT_HIT_REGION, Property::READ_WRITE ); - mPropertyBackingRegion = self.RegisterProperty( Dali::Toolkit::Slider::BACKING_REGION_PROPERTY_NAME, DEFAULT_BACKING_REGION, Property::READ_WRITE ); - mPropertyHandleRegion = self.RegisterProperty( Dali::Toolkit::Slider::HANDLE_REGION_PROPERTY_NAME, DEFAULT_HANDLE_REGION, Property::READ_WRITE ); - - mPropertyBackingImageName = self.RegisterProperty( Dali::Toolkit::Slider::BACKING_IMAGE_NAME_PROPERTY_NAME, SKINNED_BACKING_IMAGE_NAME, Property::READ_WRITE ); - mPropertyHandleImageName = self.RegisterProperty( Dali::Toolkit::Slider::HANDLE_IMAGE_NAME_PROPERTY_NAME, SKINNED_HANDLE_IMAGE_NAME, Property::READ_WRITE ); - - mPropertyProgressImageName = self.RegisterProperty( Dali::Toolkit::Slider::PROGRESS_IMAGE_NAME_PROPERTY_NAME, SKINNED_PROGRESS_IMAGE_NAME, Property::READ_WRITE ); - mPropertyPopupImageName = self.RegisterProperty( Dali::Toolkit::Slider::POPUP_IMAGE_NAME_PROPERTY_NAME, SKINNED_POPUP_IMAGE_NAME, Property::READ_WRITE ); - mPropertyPopupArrowImageName = self.RegisterProperty( Dali::Toolkit::Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY_NAME, SKINNED_POPUP_ARROW_IMAGE_NAME, Property::READ_WRITE ); - - mPropertyBackingScale9Border = self.RegisterProperty( Dali::Toolkit::Slider::BACKING_SCALE9_BORDER_PROPERTY_NAME, SKINNED_BACKING_SCALE9_BORDER, Property::READ_WRITE ); - mPropertyProgressScale9Border = self.RegisterProperty( Dali::Toolkit::Slider::PROGRESS_SCALE9_BORDER_PROPERTY_NAME, SKINNED_PROGRESS_SCALE9_BORDER, Property::READ_WRITE ); - mPropertyPopupScale9Border = self.RegisterProperty( Dali::Toolkit::Slider::POPUP_SCALE9_BORDER_PROPERTY_NAME, SKINNED_POPUP_SCALE9_BORDER, Property::READ_WRITE ); + SetHitRegion( DEFAULT_HIT_REGION ); + SetBackingRegion( DEFAULT_BACKING_REGION ); + SetHandleRegion( DEFAULT_HANDLE_REGION ); - mPropertyDisableColor = self.RegisterProperty( Dali::Toolkit::Slider::DISABLE_COLOR_PROPERTY_NAME, DEFAULT_DISABLE_COLOR, Property::READ_WRITE ); - mPropertyPopupTextColor = self.RegisterProperty( Dali::Toolkit::Slider::POPUP_TEXT_COLOR_PROPERTY_NAME, DEFAULT_POPUP_TEXT_COLOR, Property::READ_WRITE ); + SetBackingImageName( SKINNED_BACKING_IMAGE_NAME ); + SetHandleImageName( SKINNED_HANDLE_IMAGE_NAME ); + SetProgressImageName( SKINNED_PROGRESS_IMAGE_NAME ); + SetPopupImageName( SKINNED_POPUP_IMAGE_NAME ); + SetPopupArrowImageName( SKINNED_POPUP_ARROW_IMAGE_NAME ); - mPropertyValuePrecision = self.RegisterProperty( Dali::Toolkit::Slider::VALUE_PRECISION_PROPERTY_NAME, DEFAULT_VALUE_PRECISION, Property::READ_WRITE ); - mPropertyShowPopup = self.RegisterProperty( Dali::Toolkit::Slider::SHOW_POPUP_PROPERTY_NAME, DEFAULT_SHOW_POPUP, Property::READ_WRITE ); - mPropertyShowValue = self.RegisterProperty( Dali::Toolkit::Slider::SHOW_VALUE_PROPERTY_NAME, DEFAULT_SHOW_VALUE, Property::READ_WRITE ); + SetPopupTextColor( DEFAULT_POPUP_TEXT_COLOR ); - mPropertyEnabled = self.RegisterProperty( Dali::Toolkit::Slider::ENABLED_PROPERTY_NAME, DEFAULT_ENABLED, Property::READ_WRITE ); + SetShowPopup( DEFAULT_SHOW_POPUP ); + SetShowValue( DEFAULT_SHOW_VALUE ); - mPropertyMarks = self.RegisterProperty( Dali::Toolkit::Slider::MARKS_PROPERTY_NAME, mMarks, Property::READ_WRITE ); - mPropertySnapToMarks = self.RegisterProperty( Dali::Toolkit::Slider::SNAP_TO_MARKS_PROPERTY_NAME, false, Property::READ_WRITE ); - mPropertyMarkTolerance = self.RegisterProperty( Dali::Toolkit::Slider::MARK_TOLERANCE_PROPERTY_NAME, MARK_SNAP_TOLERANCE, Property::READ_WRITE ); + SetEnabled( DEFAULT_ENABLED ); + SetDisableColor( DEFAULT_DISABLE_COLOR ); - mPropertyLowerBound = self.RegisterProperty( Dali::Toolkit::Slider::LOWER_BOUND_PROPERTY_NAME, DEFAULT_LOWER_BOUND, Property::READ_WRITE ); - mPropertyUpperBound = self.RegisterProperty( Dali::Toolkit::Slider::UPPER_BOUND_PROPERTY_NAME, DEFAULT_UPPER_BOUND, Property::READ_WRITE ); - mPropertyValue = self.RegisterProperty( Dali::Toolkit::Slider::VALUE_PROPERTY_NAME, DEFAULT_VALUE, Property::READ_WRITE ); + SetSnapToMarks( DEFAULT_SNAP_TO_MARKS ); + SetMarkTolerance( MARK_SNAP_TOLERANCE ); - ResizeHitRegion( DEFAULT_HIT_REGION ); - SetBackingRegion( DEFAULT_BACKING_REGION ); - UpdateHandleRegion( DEFAULT_HANDLE_REGION ); - CreateBackingImage( SKINNED_BACKING_IMAGE_NAME ); - CreateHandleImage( SKINNED_HANDLE_IMAGE_NAME ); - CreateProgressImage( SKINNED_PROGRESS_IMAGE_NAME ); - CreatePopupImage( SKINNED_POPUP_IMAGE_NAME ); - CreatePopupArrowImage( SKINNED_POPUP_ARROW_IMAGE_NAME ); - SetBackingScale9( SKINNED_BACKING_SCALE9_BORDER ); - SetProgressScale9( SKINNED_PROGRESS_SCALE9_BORDER ); - SetPopupScale9( SKINNED_POPUP_SCALE9_BORDER ); - UpdatePopupTextColor( DEFAULT_POPUP_TEXT_COLOR ); - ShowPopup( DEFAULT_SHOW_POPUP ); - ShowValue( DEFAULT_SHOW_VALUE ); - SetEnabled( DEFAULT_ENABLED ); - UpdateLowerBound( DEFAULT_LOWER_BOUND ); - UpdateUpperBound( DEFAULT_UPPER_BOUND ); + SetLowerBound( DEFAULT_LOWER_BOUND ); + SetUpperBound( DEFAULT_UPPER_BOUND ); UpdateSkin(); - DisplayValue( DEFAULT_VALUE, false ); // Run this last to display the correct value + SetValuePrecision( DEFAULT_VALUE_PRECISION ); + mValue = DEFAULT_VALUE; + DisplayValue( mValue, false ); // Run this last to display the correct value // Size the Slider actor to a default self.SetSize( DEFAULT_HIT_REGION.x, DEFAULT_HIT_REGION.y ); @@ -211,12 +228,20 @@ bool Slider::OnTouchEvent(Actor actor, const TouchEvent& event) SetValue( value ); DisplayPopup( value ); } + else if( touchState == TouchPoint::Up) + { + if( mState == PRESSED ) + { + mState = NORMAL; + mSlidingFinishedSignal.Emit( Toolkit::Slider::DownCast( Self() ), GetValue() ); + } + } } return true; } -void Slider::OnPan( Actor actor, PanGesture gesture ) +void Slider::OnPan( Actor actor, const PanGesture& gesture ) { // gesture.position is in local actor coordinates if( mState != DISABLED ) @@ -235,11 +260,15 @@ void Slider::OnPan( Actor actor, PanGesture gesture ) } case Gesture::Finished: { - if( mState == PRESSED && GetSnapToMarks() ) + if( mState == PRESSED ) { - float value = MapBounds( SnapToMark( MapPercentage( gesture.position ) ), GetLowerBound(), GetUpperBound() ); - SetValue( value ); - DisplayPopup( value ); + if( GetSnapToMarks() ) + { + float value = MapBounds( SnapToMark( MapPercentage( gesture.position ) ), GetLowerBound(), GetUpperBound() ); + SetValue( value ); + DisplayPopup( value ); + } + mSlidingFinishedSignal.Emit( Toolkit::Slider::DownCast( Self() ), GetValue() ); } mState = NORMAL; @@ -319,12 +348,13 @@ void Slider::DisplayValue( float value, bool raiseSignals ) } } - if( mHandleValueTextView ) + if( mHandleValueTextLabel ) { std::stringstream ss; ss.precision( GetValuePrecision() ); - ss << fixed << clampledValue; - mHandleValueTextView.SetText( ss.str() ); + ss << std::fixed << clampledValue; + + mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, ss.str() ); } } @@ -345,9 +375,14 @@ const Slider::MarkList& Slider::GetMarks() const return mMarks; } +void Slider::SetSnapToMarks( bool snap ) +{ + mSnapToMarks = snap; +} + bool Slider::GetSnapToMarks() const { - return Self().GetProperty( mPropertySnapToMarks ); + return mSnapToMarks; } Actor Slider::CreateHitRegion() @@ -363,6 +398,7 @@ Actor Slider::CreateHitRegion() ImageActor Slider::CreateBacking() { ImageActor backing = ImageActor::New(); + backing.SetRelayoutEnabled( false ); backing.SetParentOrigin( ParentOrigin::CENTER ); backing.SetAnchorPoint( AnchorPoint::CENTER ); backing.SetZ( BACKING_Z ); @@ -370,35 +406,29 @@ ImageActor Slider::CreateBacking() return backing; } -void Slider::CreateBackingImage( const std::string& imageName ) +void Slider::SetBackingImageName( const std::string& imageName ) { - if( mBacking && imageName != String::EMPTY ) + if( mBacking && ( imageName.size() > 0 ) ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mBacking.SetImage( image ); } } -void Slider::SetBackingScale9( const Vector4& border ) +std::string Slider::GetBackingImageName() { if( mBacking ) { - mBacking.SetStyle( ImageActor::STYLE_NINE_PATCH ); - mBacking.SetNinePatchBorder( border ); + return ResourceImage::DownCast( mBacking.GetImage() ).GetUrl(); } -} -void Slider::SetBackingRegionSize( const Vector2& region ) -{ - if( mBacking ) - { - mBacking.SetSize( region ); - } + return std::string( "" ); } ImageActor Slider::CreateProgress() { ImageActor progress = ImageActor::New(); + progress.SetRelayoutEnabled( false ); progress.SetParentOrigin( ParentOrigin::CENTER_LEFT ); progress.SetAnchorPoint( AnchorPoint::CENTER_LEFT ); progress.SetZ( PROGRESS_Z ); @@ -406,48 +436,60 @@ ImageActor Slider::CreateProgress() return progress; } -void Slider::CreateProgressImage( const std::string& imageName ) +void Slider::SetProgressImageName( const std::string& imageName ) { - if( mProgress && imageName != String::EMPTY ) + if( mProgress && ( imageName.size() > 0 ) ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mProgress.SetImage( image ); } } -void Slider::CreatePopupImage( const std::string& imageName ) +std::string Slider::GetProgressImageName() { - if( mPopup && imageName != String::EMPTY ) + if( mProgress ) { - Image image = Image::New( imageName ); - mPopup.SetImage( image ); + return ResourceImage::DownCast( mProgress.GetImage()).GetUrl(); } + + return std::string( "" ); } -void Slider::CreatePopupArrowImage( const std::string& imageName ) +void Slider::SetPopupImageName( const std::string& imageName ) { - if( mPopupArrow && imageName != String::EMPTY ) - { - Image image = Image::New( imageName ); - mPopupArrow.SetImage( image ); - } + mPopupImageName = imageName; } -void Slider::SetProgressScale9( const Vector4& border ) +std::string Slider::GetPopupImageName() { - if( mProgress ) + return mPopupImageName; +} + +void Slider::CreatePopupImage( const std::string& imageName ) +{ + if( mPopup && ( imageName.size() > 0 ) ) { - mProgress.SetStyle( ImageActor::STYLE_NINE_PATCH ); - mProgress.SetNinePatchBorder( border ); + Image image = ResourceImage::New( imageName ); + mPopup.SetImage( image ); } } -void Slider::SetPopupScale9( const Vector4& border ) +void Slider::SetPopupArrowImageName( const std::string& imageName ) +{ + mPopupArrowImageName = imageName; +} + +std::string Slider::GetPopupArrowImageName() { - if( mPopup ) + return mPopupArrowImageName; +} + +void Slider::CreatePopupArrowImage( const std::string& imageName ) +{ + if( mPopupArrow && ( imageName.size() > 0 ) ) { - mPopup.SetStyle( ImageActor::STYLE_NINE_PATCH ); - mPopup.SetNinePatchBorder( border ); + Image image = ResourceImage::New( imageName ); + mPopupArrow.SetImage( image ); } } @@ -462,6 +504,7 @@ void Slider::ResizeProgressRegion( const Vector2& region ) ImageActor Slider::CreateHandle() { ImageActor handle = ImageActor::New(); + handle.SetRelayoutEnabled( false ); handle.SetParentOrigin( ParentOrigin::CENTER_LEFT ); handle.SetAnchorPoint( AnchorPoint::CENTER ); handle.SetZ( HANDLE_Z ); @@ -472,6 +515,7 @@ ImageActor Slider::CreateHandle() ImageActor Slider::CreatePopupArrow() { ImageActor arrow = ImageActor::New(); + arrow.SetRelayoutEnabled( false ); arrow.SetParentOrigin( ParentOrigin::BOTTOM_CENTER ); arrow.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); arrow.SetZ( HANDLE_Z ); @@ -479,37 +523,49 @@ ImageActor Slider::CreatePopupArrow() return arrow; } -Toolkit::TextView Slider::CreatePopupText() +Toolkit::TextLabel Slider::CreatePopupText() { - Toolkit::TextView textView = Toolkit::TextView::New(); - textView.SetParentOrigin( ParentOrigin::CENTER ); - textView.SetAnchorPoint( AnchorPoint::CENTER ); - textView.SetSizePolicy( Control::Flexible, Control::Flexible ); - textView.SetZ( VALUE_DISPLAY_TEXT_Z ); - return textView; + Toolkit::TextLabel textLabel = Toolkit::TextLabel::New(); + textLabel.SetParentOrigin( ParentOrigin::CENTER ); + textLabel.SetAnchorPoint( AnchorPoint::CENTER ); + textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + textLabel.SetZ( VALUE_DISPLAY_TEXT_Z ); + return textLabel; } ImageActor Slider::CreatePopup() { ImageActor popup = ImageActor::New(); + popup.SetRelayoutEnabled( false ); popup.SetParentOrigin( ParentOrigin::TOP_CENTER ); popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); - mValueTextView = CreatePopupText(); - popup.Add( mValueTextView ); + mValueTextLabel = CreatePopupText(); + popup.Add( mValueTextLabel ); return popup; } -void Slider::CreateHandleImage( const std::string& imageName ) +void Slider::SetHandleImageName( const std::string& imageName ) { - if( mHandle && imageName != String::EMPTY ) + if( mHandle && ( imageName.size() > 0 ) ) { - Image image = Image::New( imageName ); + Image image = ResourceImage::New( imageName ); mHandle.SetImage( image ); } } +std::string Slider::GetHandleImageName() +{ + if( mHandle ) + { + return ResourceImage::DownCast( mHandle.GetImage() ).GetUrl(); + } + + return std::string( "" ); +} + void Slider::ResizeHandleRegion( const Vector2& region ) { if( mHandle ) @@ -520,29 +576,26 @@ void Slider::ResizeHandleRegion( const Vector2& region ) void Slider::CreateHandleValueDisplay() { - if( mHandle && !mHandleValueTextView ) + if( mHandle && !mHandleValueTextLabel ) { - mHandleValueTextView = Toolkit::TextView::New(); - mHandleValueTextView.SetParentOrigin( ParentOrigin::CENTER ); - mHandleValueTextView.SetAnchorPoint( AnchorPoint::CENTER ); - mHandleValueTextView.SetSize( GetHandleRegion() ); - mHandleValueTextView.SetZ( HANDLE_VALUE_DISPLAY_TEXT_Z ); - mHandle.Add( mHandleValueTextView ); + mHandleValueTextLabel = Toolkit::TextLabel::New(); + mHandleValueTextLabel.SetParentOrigin( ParentOrigin::CENTER ); + mHandleValueTextLabel.SetAnchorPoint( AnchorPoint::CENTER ); + mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + mHandleValueTextLabel.SetDrawMode( DrawMode::OVERLAY ); + mHandle.Add( mHandleValueTextLabel ); } } void Slider::DestroyHandleValueDisplay() { - mHandleValueTextView.Unparent(); - mHandleValueTextView.Reset(); + UnparentAndReset(mHandleValueTextLabel); } -void Slider::UpdatePopupTextColor( const Vector4& color ) +void Slider::SetPopupTextColor( const Vector4& color ) { - if( mValueTextView ) - { - mValueTextView.SetColor( color ); - } + mPopupTextColor = color; } Actor Slider::CreateValueDisplay() @@ -566,6 +619,11 @@ Toolkit::Slider::ValueChangedSignalType& Slider::ValueChangedSignal() return mValueChangedSignal; } +Toolkit::Slider::ValueChangedSignalType& Slider::SlidingFinishedSignal() +{ + return mSlidingFinishedSignal; +} + Toolkit::Slider::MarkSignalType& Slider::MarkSignal() { return mMarkSignal; @@ -625,14 +683,21 @@ void Slider::CreateChildren() mBacking.Add( mHandle ); } -void Slider::ResizeHitRegion( const Vector2& size ) +void Slider::SetHitRegion( const Vector2& size ) { + mHitRegion = size; + if( mHitArea ) { - mHitArea.SetSize( size ); + mHitArea.SetSize( mHitRegion ); } } +const Vector2& Slider::GetHitRegion() const +{ + return mHitRegion; +} + void Slider::AddPopup() { if( !mValueDisplay ) @@ -641,10 +706,8 @@ void Slider::AddPopup() mValueDisplay.SetVisible( false ); mHandle.Add( mValueDisplay ); - Actor self = Self(); - CreatePopupImage( self.GetProperty( mPropertyPopupImageName ) ); - SetPopupScale9( GetPopupScale9Border() ); - CreatePopupArrowImage( self.GetProperty( mPropertyPopupArrowImageName ) ); + CreatePopupImage( GetPopupImageName() ); + CreatePopupArrowImage( GetPopupArrowImageName() ); mValueTimer = Timer::New( VALUE_VIEW_SHOW_DURATION ); mValueTimer.TickSignal().Connect( this, &Slider::HideValueView ); @@ -737,16 +800,14 @@ bool Slider::MarkReached( float value, int& outIndex ) outIndex = current; return true; } + + if( value < mark ) + { + tail = current - 1; + } else { - if( value < mark ) - { - tail = current - 1; - } - else - { - head = current + 1; - } + head = current + 1; } } @@ -763,205 +824,109 @@ bool Slider::HideValueView() return false; } -void Slider::OnPropertySet( Property::Index index, Property::Value propertyValue ) -{ - if( index == mPropertyLowerBound ) - { - UpdateLowerBound( propertyValue.Get() ); - } - else if( index == mPropertyUpperBound ) - { - UpdateUpperBound( propertyValue.Get() ); - } - else if( index == mPropertyValue ) - { - DisplayValue( propertyValue.Get(), true ); - } - else if( index == mPropertyHitRegion ) - { - ResizeHitRegion( propertyValue.Get() ); - } - else if( index == mPropertyBackingRegion ) - { - ResizeBackingRegion( propertyValue.Get() ); - } - else if( index == mPropertyHandleRegion ) - { - UpdateHandleRegion( propertyValue.Get() ); - } - else if( index == mPropertyBackingImageName ) - { - CreateBackingImage( propertyValue.Get() ); - } - else if( index == mPropertyHandleImageName ) - { - CreateHandleImage( propertyValue.Get() ); - } - else if( index == mPropertyProgressImageName ) - { - CreateProgressImage( propertyValue.Get() ); - } - else if( index == mPropertyPopupImageName ) - { - CreatePopupImage( propertyValue.Get() ); - } - else if( index == mPropertyPopupArrowImageName ) - { - CreatePopupArrowImage( propertyValue.Get() ); - } - else if( index == mPropertyBackingScale9Border ) - { - SetBackingScale9( propertyValue.Get() ); - } - else if( index == mPropertyProgressScale9Border ) - { - SetProgressScale9( propertyValue.Get() ); - } - else if( index == mPropertyPopupScale9Border ) - { - SetPopupScale9( propertyValue.Get() ); - } - else if( index == mPropertyDisableColor ) - { - UpdateSkin(); - } - else if( index == mPropertyPopupTextColor ) - { - UpdatePopupTextColor( propertyValue.Get() ); - } - else if( index == mPropertyValuePrecision ) - { - DisplayValue( GetValue(), false ); - } - else if( index == mPropertyShowPopup ) - { - ShowPopup( propertyValue.Get() ); - } - else if( index == mPropertyShowValue ) - { - ShowValue( propertyValue.Get() ); - } - else if( index == mPropertyEnabled ) - { - SetEnabled( propertyValue.Get() ); - } - else if( index == mPropertyMarks ) - { - SetMarks( propertyValue.Get() ); - } - else if( index == mPropertySnapToMarks ) - { - // Nothing - } - else if( index == mPropertyMarkTolerance ) - { - // Nothing - } -} - -void Slider::UpdateLowerBound( float bound ) +void Slider::SetLowerBound( float bound ) { + mLowerBound = bound; DisplayValue( GetValue(), false ); } float Slider::GetLowerBound() const { - return Self().GetProperty( mPropertyLowerBound ); + return mLowerBound; } -void Slider::UpdateUpperBound( float bound ) +void Slider::SetUpperBound( float bound ) { + mUpperBound = bound; DisplayValue( GetValue(), false ); } float Slider::GetUpperBound() const { - return Self().GetProperty( mPropertyUpperBound ); + return mUpperBound; } void Slider::SetValue( float value ) { - Self().SetProperty( mPropertyValue, value ); + mValue = value; + DisplayValue( mValue, true ); } float Slider::GetValue() const { - return Self().GetProperty( mPropertyValue ); -} - -void Slider::SetHitRegion( const Vector2& region ) -{ - Self().SetProperty( mPropertyHitRegion, region ); -} - -Vector2 Slider::GetHitRegion() const -{ - return Self().GetProperty( mPropertyHitRegion ); + return mValue; } void Slider::SetBackingRegion( const Vector2& region ) { - Self().SetProperty( mPropertyBackingRegion, region ); -} + mBackingRegion = region; -void Slider::ResizeBackingRegion( const Vector2& region ) -{ - SetBackingRegionSize( region ); - ResizeProgressRegion( Vector2( 0.0f, region.y ) ); + if( mBacking ) + { + mBacking.SetSize( mBackingRegion ); + } + + ResizeProgressRegion( Vector2( 0.0f, mBackingRegion.y ) ); - mDomain = CalcDomain( region ); + mDomain = CalcDomain( mBackingRegion ); DisplayValue( GetValue(), false ); // Set the progress bar to correct width } -Vector2 Slider::GetBackingRegion() const +const Vector2& Slider::GetBackingRegion() const { - return Self().GetProperty( mPropertyBackingRegion ); + return mBackingRegion; } -void Slider::UpdateHandleRegion( const Vector2& region ) +void Slider::SetHandleRegion( const Vector2& region ) { - ResizeHandleRegion( region ); + mHandleRegionSize = region; + + ResizeHandleRegion( mHandleRegionSize ); Vector2 hitRegion = GetHitRegion(); - hitRegion.x += region.x; + hitRegion.x += mHandleRegionSize.x; SetHitRegion( hitRegion ); } -Vector2 Slider::GetHandleRegion() const +const Vector2& Slider::GetHandleRegion() const { - return Self().GetProperty( mPropertyHandleRegion ); + return mHandleRegionSize; } -Vector4 Slider::GetBackingScale9Border() const +void Slider::SetDisableColor( const Vector4& color ) { - return Self().GetProperty( mPropertyBackingScale9Border ); -} + mDisableColor = color; -Vector4 Slider::GetPopupScale9Border() const -{ - return Self().GetProperty( mPropertyPopupScale9Border ); + UpdateSkin(); } Vector4 Slider::GetDisableColor() const { - return Self().GetProperty( mPropertyDisableColor ); + return mDisableColor; } Vector4 Slider::GetPopupTextColor() const { - return Self().GetProperty( mPropertyPopupTextColor ); + return mPopupTextColor; +} + +void Slider::SetValuePrecision( int precision ) +{ + mValuePrecision = precision; } int Slider::GetValuePrecision() const { - return Self().GetProperty( mPropertyValuePrecision ); + return mValuePrecision; } -void Slider::ShowPopup( bool showPopup ) +void Slider::SetShowPopup( bool showPopup ) { + mShowPopup = showPopup; + // Value display - if( showPopup ) + if( mShowPopup ) { AddPopup(); } @@ -973,12 +938,14 @@ void Slider::ShowPopup( bool showPopup ) bool Slider::GetShowPopup() const { - return Self().GetProperty( mPropertyShowPopup ); + return mShowPopup; } -void Slider::ShowValue( bool showValue ) +void Slider::SetShowValue( bool showValue ) { - if( showValue ) + mShowValue = showValue; + + if( mShowValue ) { CreateHandleValueDisplay(); } @@ -990,7 +957,7 @@ void Slider::ShowValue( bool showValue ) bool Slider::GetShowValue() const { - return Self().GetProperty( mPropertyShowValue ); + return mShowValue; } void Slider::SetEnabled( bool enabled ) @@ -1012,13 +979,17 @@ bool Slider::IsEnabled() const return mState != DISABLED; } -float Slider::GetMarkTolerance() const +void Slider::SetMarkTolerance( float tolerance ) { - return Self().GetProperty( mPropertyMarkTolerance ); + mMarkTolerance = tolerance; } -// static class method to support script connecting signals +float Slider::GetMarkTolerance() const +{ + return mMarkTolerance; +} +// Static class method to support script connecting signals bool Slider::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tracker, const std::string& signalName, FunctorDelegate* functor ) { Dali::BaseHandle handle( object ); @@ -1026,15 +997,15 @@ bool Slider::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tr bool connected = true; Toolkit::Slider slider = Toolkit::Slider::DownCast( handle ); - if( signalName == Dali::Toolkit::Slider::SIGNAL_VALUE_CHANGED ) + if( 0 == strcmp( signalName.c_str(), SIGNAL_VALUE_CHANGED ) ) { slider.ValueChangedSignal().Connect( tracker, functor ); } - else if( signalName == Dali::Toolkit::Slider::SIGNAL_MARK ) + else if( 0 == strcmp( signalName.c_str(), SIGNAL_MARK ) ) { slider.MarkSignal().Connect( tracker, functor ); } - else + else { // signalName does not match any signal connected = false; @@ -1045,34 +1016,293 @@ bool Slider::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tr void Slider::DisplayPopup( float value ) { - // Value display - if( mValueTextView ) + // Value displayDoConnectSignal + if( mValueTextLabel ) { std::stringstream ss; ss.precision( GetValuePrecision() ); - ss << fixed << value; - mValueTextView.SetText( ss.str() ); - TextStyle style; - style.SetTextColor( GetPopupTextColor() ); - mValueTextView.SetStyleToCurrentText( style, TextStyle::COLOR); + ss << std::fixed << value; + mValueTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, ss.str() ); if( mValueDisplay ) { - Font font = Font::New(); - float popupWidth = font.MeasureText( ss.str() ).x + VALUE_POPUP_MARGIN * 2.0f; - if( popupWidth < VALUE_POPUP_MIN_WIDTH ) + mValueDisplay.SetVisible( true ); + + mValueTimer.SetInterval( VALUE_VIEW_SHOW_DURATION ); + } + } +} + +void Slider::SetProperty( BaseObject* object, Property::Index propertyIndex, const Property::Value& value ) +{ + Toolkit::Slider slider = Toolkit::Slider::DownCast( Dali::BaseHandle( object ) ); + + if ( slider ) + { + Slider& sliderImpl( GetImpl( slider ) ); + + switch ( propertyIndex ) + { + case Toolkit::Slider::Property::LOWER_BOUND: { - popupWidth = VALUE_POPUP_MIN_WIDTH; + sliderImpl.SetLowerBound( value.Get< float >() ); + break; } - mPopup.SetSize( popupWidth, VALUE_POPUP_HEIGHT ); - mValueDisplay.SetVisible( true ); + case Toolkit::Slider::Property::UPPER_BOUND: + { + sliderImpl.SetUpperBound( value.Get< float >() ); + break; + } - mValueTimer.SetInterval( VALUE_VIEW_SHOW_DURATION ); + case Toolkit::Slider::Property::VALUE: + { + sliderImpl.SetValue( value.Get< float >() ); + break; + } + + case Toolkit::Slider::Property::HIT_REGION: + { + sliderImpl.SetHitRegion( value.Get< Vector2 >() ); + break; + } + + case Toolkit::Slider::Property::BACKING_REGION: + { + sliderImpl.SetBackingRegion( value.Get< Vector2 >() ); + break; + } + + case Toolkit::Slider::Property::HANDLE_REGION: + { + sliderImpl.SetHandleRegion( value.Get< Vector2 >() ); + break; + } + + case Toolkit::Slider::Property::BACKING_IMAGE_NAME: + { + sliderImpl.SetBackingImageName( value.Get< std::string >() ); + break; + } + + case Toolkit::Slider::Property::HANDLE_IMAGE_NAME: + { + sliderImpl.SetHandleImageName( value.Get< std::string >() ); + break; + } + + case Toolkit::Slider::Property::PROGRESS_IMAGE_NAME: + { + sliderImpl.SetProgressImageName( value.Get< std::string >() ); + break; + } + + case Toolkit::Slider::Property::POPUP_IMAGE_NAME: + { + sliderImpl.SetPopupImageName( value.Get< std::string >() ); + break; + } + + case Toolkit::Slider::Property::POPUP_ARROW_IMAGE_NAME: + { + sliderImpl.SetPopupArrowImageName( value.Get< std::string >() ); + break; + } + + case Toolkit::Slider::Property::DISABLE_COLOR: + { + sliderImpl.SetDisableColor( value.Get< Vector4 >() ); + break; + } + + case Toolkit::Slider::Property::POPUP_TEXT_COLOR: + { + sliderImpl.SetPopupTextColor( value.Get< Vector4 >() ); + break; + } + + case Toolkit::Slider::Property::VALUE_PRECISION: + { + sliderImpl.SetValuePrecision( value.Get< int >() ); + break; + } + + case Toolkit::Slider::Property::SHOW_POPUP: + { + sliderImpl.SetShowPopup( value.Get< bool >() ); + break; + } + + case Toolkit::Slider::Property::SHOW_VALUE: + { + sliderImpl.SetShowValue( value.Get< bool >() ); + break; + } + + case Toolkit::Slider::Property::ENABLED: + { + sliderImpl.SetEnabled( value.Get< bool >() ); + break; + } + + case Toolkit::Slider::Property::MARKS: + { + sliderImpl.SetMarks( value.Get< Property::Array >() ); + break; + } + + case Toolkit::Slider::Property::SNAP_TO_MARKS: + { + sliderImpl.SetSnapToMarks( value.Get< bool >() ); + break; + } + + case Toolkit::Slider::Property::MARK_TOLERANCE: + { + sliderImpl.SetMarkTolerance( value.Get< float >() ); + break; + } } } } +Property::Value Slider::GetProperty( BaseObject* object, Property::Index propertyIndex ) +{ + Property::Value value; + + Toolkit::Slider slider = Toolkit::Slider::DownCast( Dali::BaseHandle( object ) ); + + if ( slider ) + { + Slider& sliderImpl( GetImpl( slider ) ); + + switch ( propertyIndex ) + { + case Toolkit::Slider::Property::LOWER_BOUND: + { + value = sliderImpl.GetLowerBound(); + break; + } + + case Toolkit::Slider::Property::UPPER_BOUND: + { + value = sliderImpl.GetUpperBound(); + break; + } + + case Toolkit::Slider::Property::VALUE: + { + value = sliderImpl.GetValue(); + break; + } + + case Toolkit::Slider::Property::HIT_REGION: + { + value = sliderImpl.GetHitRegion(); + break; + } + + case Toolkit::Slider::Property::BACKING_REGION: + { + value = sliderImpl.GetBackingRegion(); + break; + } + + case Toolkit::Slider::Property::HANDLE_REGION: + { + value = sliderImpl.GetHandleRegion(); + break; + } + + case Toolkit::Slider::Property::BACKING_IMAGE_NAME: + { + value = sliderImpl.GetBackingImageName(); + break; + } + + case Toolkit::Slider::Property::HANDLE_IMAGE_NAME: + { + value = sliderImpl.GetHandleImageName(); + break; + } + + case Toolkit::Slider::Property::PROGRESS_IMAGE_NAME: + { + value = sliderImpl.GetProgressImageName(); + break; + } + + case Toolkit::Slider::Property::POPUP_IMAGE_NAME: + { + value = sliderImpl.GetPopupImageName(); + break; + } + + case Toolkit::Slider::Property::POPUP_ARROW_IMAGE_NAME: + { + value = sliderImpl.GetPopupArrowImageName(); + break; + } + + case Toolkit::Slider::Property::DISABLE_COLOR: + { + value = sliderImpl.GetDisableColor(); + break; + } + + case Toolkit::Slider::Property::POPUP_TEXT_COLOR: + { + value = sliderImpl.GetPopupTextColor(); + break; + } + + case Toolkit::Slider::Property::VALUE_PRECISION: + { + value = sliderImpl.GetValuePrecision(); + break; + } + + case Toolkit::Slider::Property::SHOW_POPUP: + { + value = sliderImpl.GetShowPopup(); + break; + } + + case Toolkit::Slider::Property::SHOW_VALUE: + { + value = sliderImpl.GetShowValue(); + break; + } + + case Toolkit::Slider::Property::ENABLED: + { + value = sliderImpl.IsEnabled(); + break; + } + + case Toolkit::Slider::Property::MARKS: + { + // TODO: Need to be able to return a PropertyArray + // value = sliderImpl.GetMarks(); + break; + } + + case Toolkit::Slider::Property::SNAP_TO_MARKS: + { + value = sliderImpl.GetSnapToMarks(); + break; + } + + case Toolkit::Slider::Property::MARK_TOLERANCE: + { + value = sliderImpl.GetMarkTolerance(); + break; + } + } + } + + return value; +} } // namespace Internal