From 7f0ad1026f4aa7ae6a1e658d3b2fc166690c4fa7 Mon Sep 17 00:00:00 2001 From: Seoyeon Kim Date: Tue, 8 Aug 2017 15:20:09 +0900 Subject: [PATCH] Fix Slider MARKS GetProperty value - Fixed to return a PropertyArray of Slider MARKS property Change-Id: Icc970a2a11a6ffed9de5f23adc053b422cfdb0cc Signed-off-by: Seoyeon Kim --- dali-toolkit/internal/controls/slider/slider-impl.cpp | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/dali-toolkit/internal/controls/slider/slider-impl.cpp b/dali-toolkit/internal/controls/slider/slider-impl.cpp index 213818a..275995d 100755 --- a/dali-toolkit/internal/controls/slider/slider-impl.cpp +++ b/dali-toolkit/internal/controls/slider/slider-impl.cpp @@ -1378,8 +1378,15 @@ Property::Value Slider::GetProperty( BaseObject* object, Property::Index propert case Toolkit::Slider::Property::MARKS: { - // TODO: Need to be able to return a PropertyArray - // value = sliderImpl.GetMarks(); + Property::Value value1( Property::ARRAY ); + Property::Array* markArray = value1.GetArray(); + + if( markArray ) + { + *markArray = sliderImpl.GetMarks(); + } + + value = value1; break; } -- 2.7.4