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=ca94e9190f5f3e16bad379acc4862beca0e72eed;hp=c44c9afe0b8a6345cc51d21c1adcd9efa2bdacd9;hb=f3da11c2818c6d17706fbb2417f21b602b3190f5;hpb=dc3613bb6248908c267a76e378b04962bce85664 diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index c44c9af..ca94e91 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -19,14 +19,16 @@ #include // EXTERNAL INCLUDES +#include // for strcmp +#include +#include #include #include - -// EXTERNAL INCLUDES -#include +#include #include -#include +// INTERNAL INCLUDES +#include using namespace Dali; @@ -36,40 +38,46 @@ namespace Dali namespace Toolkit { -// Properties -const Property::Index Slider::LOWER_BOUND_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX; -const Property::Index Slider::UPPER_BOUND_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 1; - -const Property::Index Slider::VALUE_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 2; -const Property::Index Slider::HIT_REGION_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 3; -const Property::Index Slider::BACKING_REGION_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 4; -const Property::Index Slider::HANDLE_REGION_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 5; - -const Property::Index Slider::BACKING_IMAGE_NAME_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 6; -const Property::Index Slider::HANDLE_IMAGE_NAME_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 7; -const Property::Index Slider::PROGRESS_IMAGE_NAME_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 8; -const Property::Index Slider::POPUP_IMAGE_NAME_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 9; -const Property::Index Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 10; - -const Property::Index Slider::DISABLE_COLOR_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 11; -const Property::Index Slider::POPUP_TEXT_COLOR_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 12; - -const Property::Index Slider::VALUE_PRECISION_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 13; - -const Property::Index Slider::SHOW_POPUP_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 14; -const Property::Index Slider::SHOW_VALUE_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 15; - -const Property::Index Slider::ENABLED_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 16; - -const Property::Index Slider::MARKS_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 17; -const Property::Index Slider::SNAP_TO_MARKS_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 18; -const Property::Index Slider::MARK_TOLERANCE_PROPERTY = Internal::Slider::SLIDER_PROPERTY_START_INDEX + 19; - 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( Toolkit, Slider, "lowerBound", FLOAT, LOWER_BOUND ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "upperBound", FLOAT, UPPER_BOUND ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "value", FLOAT, VALUE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "hitRegion", VECTOR2, HIT_REGION ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "backingRegion", VECTOR2, BACKING_REGION ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "handleRegion", VECTOR2, HANDLE_REGION ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "backingImageName", STRING, BACKING_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "handleImageName", STRING, HANDLE_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "progressImageName", STRING, PROGRESS_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "popupImageName", STRING, POPUP_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "popupArrowImageName", STRING, POPUP_ARROW_IMAGE_NAME ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "disableColor", VECTOR4, DISABLE_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "popupTextColor", VECTOR4, POPUP_TEXT_COLOR ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "valuePrecision", INTEGER, VALUE_PRECISION ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "showPopup", BOOLEAN, SHOW_POPUP ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "showValue", BOOLEAN, SHOW_VALUE ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "enabled", BOOLEAN, ENABLED ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "marks", ARRAY, MARKS ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "snapToMarks", BOOLEAN, SNAP_TO_MARKS ) +DALI_PROPERTY_REGISTRATION( Toolkit, Slider, "markTolerance", FLOAT, MARK_TOLERANCE ) + +DALI_SIGNAL_REGISTRATION( Toolkit, Slider, "valueChanged", SIGNAL_VALUE_CHANGED ) +DALI_SIGNAL_REGISTRATION( Toolkit, 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; @@ -88,6 +96,7 @@ const float DEFAULT_WIDTH = 0.0f; const float DEFAULT_HEIGHT = 27.0f; const float DEFAULT_HIT_HEIGHT = 72.0f; const float DEFAULT_HANDLE_HEIGHT = DEFAULT_HIT_HEIGHT; +const float POPUP_TEXT_PADDING = 10.0f; 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";; @@ -116,50 +125,7 @@ const bool DEFAULT_SHOW_VALUE = true; const bool DEFAULT_ENABLED = true; const bool DEFAULT_SNAP_TO_MARKS = false; -// Signals - -const char* const SIGNAL_VALUE_CHANGED = "value-changed"; -const char* const SIGNAL_MARK = "mark"; - -BaseHandle Create() -{ - return Dali::Toolkit::Slider::New(); -} - -TypeRegistration typeRegistration( typeid( Dali::Toolkit::Slider ), typeid( Dali::Toolkit::Control ), Create ); - -SignalConnectorType signalConnector1( typeRegistration, SIGNAL_VALUE_CHANGED, &Toolkit::Internal::Slider::DoConnectSignal ); -SignalConnectorType signalConnector2( typeRegistration, SIGNAL_MARK, &Toolkit::Internal::Slider::DoConnectSignal ); - -PropertyRegistration property1( typeRegistration, "lower-bound", Toolkit::Slider::LOWER_BOUND_PROPERTY, Property::FLOAT, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property2( typeRegistration, "upper-bound", Toolkit::Slider::UPPER_BOUND_PROPERTY, Property::FLOAT, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property3( typeRegistration, "value", Toolkit::Slider::VALUE_PROPERTY, Property::FLOAT, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property4( typeRegistration, "hit-region", Toolkit::Slider::HIT_REGION_PROPERTY, Property::VECTOR2, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property5( typeRegistration, "backing-region", Toolkit::Slider::BACKING_REGION_PROPERTY, Property::VECTOR2, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property6( typeRegistration, "handle-region", Toolkit::Slider::HANDLE_REGION_PROPERTY, Property::VECTOR2, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property7( typeRegistration, "backing-image-name", Toolkit::Slider::BACKING_IMAGE_NAME_PROPERTY, Property::STRING, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property8( typeRegistration, "handle-image-name", Toolkit::Slider::HANDLE_IMAGE_NAME_PROPERTY, Property::STRING, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property9( typeRegistration, "progress-image-name", Toolkit::Slider::PROGRESS_IMAGE_NAME_PROPERTY, Property::STRING, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property10( typeRegistration, "popup-image-name", Toolkit::Slider::POPUP_IMAGE_NAME_PROPERTY, Property::STRING, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property11( typeRegistration, "popup-arrow-image-name", Toolkit::Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY, Property::STRING, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property12( typeRegistration, "disable-color", Toolkit::Slider::DISABLE_COLOR_PROPERTY, Property::VECTOR4, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property13( typeRegistration, "popup-text-color", Toolkit::Slider::POPUP_TEXT_COLOR_PROPERTY, Property::VECTOR4, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property14( typeRegistration, "value-precision", Toolkit::Slider::VALUE_PRECISION_PROPERTY, Property::INTEGER, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property15( typeRegistration, "show-popup", Toolkit::Slider::SHOW_POPUP_PROPERTY, Property::BOOLEAN, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property16( typeRegistration, "show-value", Toolkit::Slider::SHOW_VALUE_PROPERTY, Property::BOOLEAN, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property17( typeRegistration, "enabled", Toolkit::Slider::ENABLED_PROPERTY, Property::BOOLEAN, &Slider::SetProperty, &Slider::GetProperty ); - -PropertyRegistration property18( typeRegistration, "marks", Toolkit::Slider::MARKS_PROPERTY, Property::ARRAY, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property19( typeRegistration, "snap-to-marks", Toolkit::Slider::SNAP_TO_MARKS_PROPERTY, Property::BOOLEAN, &Slider::SetProperty, &Slider::GetProperty ); -PropertyRegistration property20( typeRegistration, "mark-tolerance", Toolkit::Slider::MARK_TOLERANCE_PROPERTY, Property::FLOAT, &Slider::SetProperty, &Slider::GetProperty ); - -} // namespace +} // Unnamed namespace /////////////////////////////////////////////////////////////////////////////////////////////////// // Slider @@ -243,7 +209,7 @@ void Slider::OnInitialize() self.SetSize( DEFAULT_HIT_REGION.x, DEFAULT_HIT_REGION.y ); } -void Slider::OnControlSizeSet( const Vector3& size ) +void Slider::OnSizeSet( const Vector3& size ) { // Factor in handle overshoot into size of backing SetHitRegion( Vector2( size.x, GetHitRegion().y ) ); @@ -361,15 +327,7 @@ void Slider::DisplayValue( float value, bool raiseSignals ) // Progress bar if( mProgress ) { - if( clampledValue > 0.0f ) - { - mProgress.SetVisible( true ); // Deliberately set this in case multiple SetValues are fired at once - mProgress.SetSize( x, GetBackingRegion().y ); - } - else - { - mProgress.SetVisible( false ); - } + mProgress.SetSize( x, GetBackingRegion().y ); } // Signals @@ -385,25 +343,19 @@ void Slider::DisplayValue( float value, bool raiseSignals ) } } - if( mHandleValueTextView ) + if( mHandleValueTextLabel ) { std::stringstream ss; ss.precision( GetValuePrecision() ); ss << std::fixed << clampledValue; - mHandleValueTextView.SetText( ss.str() ); + + mHandleValueTextLabel.SetProperty( Toolkit::TextLabel::Property::TEXT, ss.str() ); } } void Slider::SetMarks( const MarkList& marks ) { - float value; - for( MarkList::const_iterator it = marks.begin(), itEnd = marks.end(); it != itEnd; ++it ) - { - const Property::Value& propertyValue = *it; - propertyValue.Get( value ); - - mMarks.push_back( value ); - } + mMarks = marks; } const Slider::MarkList& Slider::GetMarks() const @@ -443,7 +395,7 @@ ImageActor Slider::CreateBacking() void Slider::SetBackingImageName( const std::string& imageName ) { - if( mBacking && imageName != String::EMPTY ) + if( mBacking && ( imageName.size() > 0 ) ) { Image image = ResourceImage::New( imageName ); mBacking.SetImage( image ); @@ -472,7 +424,7 @@ ImageActor Slider::CreateProgress() void Slider::SetProgressImageName( const std::string& imageName ) { - if( mProgress && imageName != String::EMPTY ) + if( mProgress && ( imageName.size() > 0 ) ) { Image image = ResourceImage::New( imageName ); mProgress.SetImage( image ); @@ -501,7 +453,7 @@ std::string Slider::GetPopupImageName() void Slider::CreatePopupImage( const std::string& imageName ) { - if( mPopup && imageName != String::EMPTY ) + if( mPopup && ( imageName.size() > 0 ) ) { Image image = ResourceImage::New( imageName ); mPopup.SetImage( image ); @@ -520,7 +472,7 @@ std::string Slider::GetPopupArrowImageName() void Slider::CreatePopupArrowImage( const std::string& imageName ) { - if( mPopupArrow && imageName != String::EMPTY ) + if( mPopupArrow && ( imageName.size() > 0 ) ) { Image image = ResourceImage::New( imageName ); mPopupArrow.SetImage( image ); @@ -555,14 +507,18 @@ 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( Toolkit::Control::Flexible, Toolkit::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.SetResizePolicy( ResizePolicy::USE_NATURAL_SIZE, Dimension::ALL_DIMENSIONS ); + textLabel.SetProperty( Toolkit::TextLabel::Property::HORIZONTAL_ALIGNMENT, "CENTER" ); + textLabel.SetProperty( Toolkit::TextLabel::Property::VERTICAL_ALIGNMENT, "CENTER" ); + textLabel.SetProperty( Toolkit::TextLabel::Property::TEXT_COLOR, DEFAULT_POPUP_TEXT_COLOR ); + textLabel.SetZ( VALUE_DISPLAY_TEXT_Z ); + textLabel.SetPadding( Padding( POPUP_TEXT_PADDING, POPUP_TEXT_PADDING, 0.0f, 0.0f ) ); + return textLabel; } ImageActor Slider::CreatePopup() @@ -570,16 +526,17 @@ ImageActor Slider::CreatePopup() ImageActor popup = ImageActor::New(); popup.SetParentOrigin( ParentOrigin::TOP_CENTER ); popup.SetAnchorPoint( AnchorPoint::BOTTOM_CENTER ); + popup.SetResizePolicy( ResizePolicy::FIT_TO_CHILDREN, Dimension::WIDTH ); - mValueTextView = CreatePopupText(); - popup.Add( mValueTextView ); + mValueTextLabel = CreatePopupText(); + popup.Add( mValueTextLabel ); return popup; } void Slider::SetHandleImageName( const std::string& imageName ) { - if( mHandle && imageName != String::EMPTY ) + if( mHandle && ( imageName.size() > 0 ) ) { Image image = ResourceImage::New( imageName ); mHandle.SetImage( image ); @@ -606,24 +563,20 @@ 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" ); + mHandle.Add( mHandleValueTextLabel ); } } void Slider::DestroyHandleValueDisplay() { - if(mHandleValueTextView) - { - mHandleValueTextView.Unparent(); - mHandleValueTextView.Reset(); - } + UnparentAndReset(mHandleValueTextLabel); } void Slider::SetPopupTextColor( const Vector4& color ) @@ -771,9 +724,9 @@ float Slider::MarkFilter( float value ) const float MARK_TOLERANCE = GetMarkTolerance(); float mark; - for( MarkList::iterator it = mMarks.begin(), itEnd = mMarks.end(); it != itEnd; ++it ) + for( MarkList::SizeType i = 0; i < mMarks.Count(); ++i) { - const Property::Value& propertyValue = *it; + const Property::Value& propertyValue = mMarks[i]; propertyValue.Get( mark ); mark = MapValuePercentage( mark ); @@ -793,9 +746,9 @@ float Slider::SnapToMark( float value ) float closestDist = std::numeric_limits::max(); float mark; - for( MarkList::iterator it = mMarks.begin(), itEnd = mMarks.end(); it != itEnd; ++it ) + for( MarkList::SizeType i = 0; i < mMarks.Count(); ++i) { - const Property::Value& propertyValue = *it; + const Property::Value& propertyValue = mMarks[i]; propertyValue.Get( mark ); mark = MapValuePercentage( mark ); @@ -816,7 +769,7 @@ bool Slider::MarkReached( float value, int& outIndex ) // Binary search int head = 0, - tail = mMarks.size() - 1; + tail = mMarks.Size() - 1; int current; float mark; @@ -833,16 +786,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; } } @@ -1052,26 +1003,15 @@ bool Slider::DoConnectSignal( BaseObject* object, ConnectionTrackerInterface* tr void Slider::DisplayPopup( float value ) { // Value displayDoConnectSignal - if( mValueTextView ) + if( mValueTextLabel ) { std::stringstream ss; ss.precision( GetValuePrecision() ); ss << std::fixed << value; - mValueTextView.SetText( ss.str() ); - TextStyle style; - style.SetTextColor( GetPopupTextColor() ); - mValueTextView.SetStyleToCurrentText( style, TextStyle::COLOR); + 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 ) - { - popupWidth = VALUE_POPUP_MIN_WIDTH; - } - - mPopup.SetSize( popupWidth, VALUE_POPUP_HEIGHT ); mValueDisplay.SetVisible( true ); mValueTimer.SetInterval( VALUE_VIEW_SHOW_DURATION ); @@ -1089,121 +1029,121 @@ void Slider::SetProperty( BaseObject* object, Property::Index propertyIndex, con switch ( propertyIndex ) { - case Toolkit::Slider::LOWER_BOUND_PROPERTY: + case Toolkit::Slider::Property::LOWER_BOUND: { sliderImpl.SetLowerBound( value.Get< float >() ); break; } - case Toolkit::Slider::UPPER_BOUND_PROPERTY: + case Toolkit::Slider::Property::UPPER_BOUND: { sliderImpl.SetUpperBound( value.Get< float >() ); break; } - case Toolkit::Slider::VALUE_PROPERTY: + case Toolkit::Slider::Property::VALUE: { sliderImpl.SetValue( value.Get< float >() ); break; } - case Toolkit::Slider::HIT_REGION_PROPERTY: + case Toolkit::Slider::Property::HIT_REGION: { sliderImpl.SetHitRegion( value.Get< Vector2 >() ); break; } - case Toolkit::Slider::BACKING_REGION_PROPERTY: + case Toolkit::Slider::Property::BACKING_REGION: { sliderImpl.SetBackingRegion( value.Get< Vector2 >() ); break; } - case Toolkit::Slider::HANDLE_REGION_PROPERTY: + case Toolkit::Slider::Property::HANDLE_REGION: { sliderImpl.SetHandleRegion( value.Get< Vector2 >() ); break; } - case Toolkit::Slider::BACKING_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::BACKING_IMAGE_NAME: { sliderImpl.SetBackingImageName( value.Get< std::string >() ); break; } - case Toolkit::Slider::HANDLE_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::HANDLE_IMAGE_NAME: { sliderImpl.SetHandleImageName( value.Get< std::string >() ); break; } - case Toolkit::Slider::PROGRESS_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::PROGRESS_IMAGE_NAME: { sliderImpl.SetProgressImageName( value.Get< std::string >() ); break; } - case Toolkit::Slider::POPUP_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::POPUP_IMAGE_NAME: { sliderImpl.SetPopupImageName( value.Get< std::string >() ); break; } - case Toolkit::Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::POPUP_ARROW_IMAGE_NAME: { sliderImpl.SetPopupArrowImageName( value.Get< std::string >() ); break; } - case Toolkit::Slider::DISABLE_COLOR_PROPERTY: + case Toolkit::Slider::Property::DISABLE_COLOR: { sliderImpl.SetDisableColor( value.Get< Vector4 >() ); break; } - case Toolkit::Slider::POPUP_TEXT_COLOR_PROPERTY: + case Toolkit::Slider::Property::POPUP_TEXT_COLOR: { sliderImpl.SetPopupTextColor( value.Get< Vector4 >() ); break; } - case Toolkit::Slider::VALUE_PRECISION_PROPERTY: + case Toolkit::Slider::Property::VALUE_PRECISION: { sliderImpl.SetValuePrecision( value.Get< int >() ); break; } - case Toolkit::Slider::SHOW_POPUP_PROPERTY: + case Toolkit::Slider::Property::SHOW_POPUP: { sliderImpl.SetShowPopup( value.Get< bool >() ); break; } - case Toolkit::Slider::SHOW_VALUE_PROPERTY: + case Toolkit::Slider::Property::SHOW_VALUE: { sliderImpl.SetShowValue( value.Get< bool >() ); break; } - case Toolkit::Slider::ENABLED_PROPERTY: + case Toolkit::Slider::Property::ENABLED: { sliderImpl.SetEnabled( value.Get< bool >() ); break; } - case Toolkit::Slider::MARKS_PROPERTY: + case Toolkit::Slider::Property::MARKS: { sliderImpl.SetMarks( value.Get< Property::Array >() ); break; } - case Toolkit::Slider::SNAP_TO_MARKS_PROPERTY: + case Toolkit::Slider::Property::SNAP_TO_MARKS: { sliderImpl.SetSnapToMarks( value.Get< bool >() ); break; } - case Toolkit::Slider::MARK_TOLERANCE_PROPERTY: + case Toolkit::Slider::Property::MARK_TOLERANCE: { sliderImpl.SetMarkTolerance( value.Get< float >() ); break; @@ -1224,122 +1164,122 @@ Property::Value Slider::GetProperty( BaseObject* object, Property::Index propert switch ( propertyIndex ) { - case Toolkit::Slider::LOWER_BOUND_PROPERTY: + case Toolkit::Slider::Property::LOWER_BOUND: { value = sliderImpl.GetLowerBound(); break; } - case Toolkit::Slider::UPPER_BOUND_PROPERTY: + case Toolkit::Slider::Property::UPPER_BOUND: { value = sliderImpl.GetUpperBound(); break; } - case Toolkit::Slider::VALUE_PROPERTY: + case Toolkit::Slider::Property::VALUE: { value = sliderImpl.GetValue(); break; } - case Toolkit::Slider::HIT_REGION_PROPERTY: + case Toolkit::Slider::Property::HIT_REGION: { value = sliderImpl.GetHitRegion(); break; } - case Toolkit::Slider::BACKING_REGION_PROPERTY: + case Toolkit::Slider::Property::BACKING_REGION: { value = sliderImpl.GetBackingRegion(); break; } - case Toolkit::Slider::HANDLE_REGION_PROPERTY: + case Toolkit::Slider::Property::HANDLE_REGION: { value = sliderImpl.GetHandleRegion(); break; } - case Toolkit::Slider::BACKING_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::BACKING_IMAGE_NAME: { value = sliderImpl.GetBackingImageName(); break; } - case Toolkit::Slider::HANDLE_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::HANDLE_IMAGE_NAME: { value = sliderImpl.GetHandleImageName(); break; } - case Toolkit::Slider::PROGRESS_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::PROGRESS_IMAGE_NAME: { value = sliderImpl.GetProgressImageName(); break; } - case Toolkit::Slider::POPUP_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::POPUP_IMAGE_NAME: { value = sliderImpl.GetPopupImageName(); break; } - case Toolkit::Slider::POPUP_ARROW_IMAGE_NAME_PROPERTY: + case Toolkit::Slider::Property::POPUP_ARROW_IMAGE_NAME: { value = sliderImpl.GetPopupArrowImageName(); break; } - case Toolkit::Slider::DISABLE_COLOR_PROPERTY: + case Toolkit::Slider::Property::DISABLE_COLOR: { value = sliderImpl.GetDisableColor(); break; } - case Toolkit::Slider::POPUP_TEXT_COLOR_PROPERTY: + case Toolkit::Slider::Property::POPUP_TEXT_COLOR: { value = sliderImpl.GetPopupTextColor(); break; } - case Toolkit::Slider::VALUE_PRECISION_PROPERTY: + case Toolkit::Slider::Property::VALUE_PRECISION: { value = sliderImpl.GetValuePrecision(); break; } - case Toolkit::Slider::SHOW_POPUP_PROPERTY: + case Toolkit::Slider::Property::SHOW_POPUP: { value = sliderImpl.GetShowPopup(); break; } - case Toolkit::Slider::SHOW_VALUE_PROPERTY: + case Toolkit::Slider::Property::SHOW_VALUE: { value = sliderImpl.GetShowValue(); break; } - case Toolkit::Slider::ENABLED_PROPERTY: + case Toolkit::Slider::Property::ENABLED: { value = sliderImpl.IsEnabled(); break; } - case Toolkit::Slider::MARKS_PROPERTY: + case Toolkit::Slider::Property::MARKS: { // TODO: Need to be able to return a PropertyArray // value = sliderImpl.GetMarks(); break; } - case Toolkit::Slider::SNAP_TO_MARKS_PROPERTY: + case Toolkit::Slider::Property::SNAP_TO_MARKS: { value = sliderImpl.GetSnapToMarks(); break; } - case Toolkit::Slider::MARK_TOLERANCE_PROPERTY: + case Toolkit::Slider::Property::MARK_TOLERANCE: { value = sliderImpl.GetMarkTolerance(); break;