Fix Slider MARKS GetProperty value 82/142982/1
authorSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 8 Aug 2017 06:20:09 +0000 (15:20 +0900)
committerSeoyeon Kim <seoyeon2.kim@samsung.com>
Tue, 8 Aug 2017 06:21:21 +0000 (15:21 +0900)
- Fixed to return a PropertyArray of Slider MARKS property

Change-Id: Icc970a2a11a6ffed9de5f23adc053b422cfdb0cc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
dali-toolkit/internal/controls/slider/slider-impl.cpp

index 213818a..275995d 100755 (executable)
@@ -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;
       }