From: Seoyeon Kim <seoyeon2.kim@samsung.com>
Date: Tue, 8 Aug 2017 06:20:09 +0000 (+0900)
Subject: Fix Slider MARKS GetProperty value
X-Git-Tag: dali_1.2.52~2^2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=7f0ad1026f4aa7ae6a1e658d3b2fc166690c4fa7

Fix Slider MARKS GetProperty value

- Fixed to return a PropertyArray of Slider MARKS property

Change-Id: Icc970a2a11a6ffed9de5f23adc053b422cfdb0cc
Signed-off-by: Seoyeon Kim <seoyeon2.kim@samsung.com>
---

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;
       }