From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Wed, 27 May 2015 09:47:23 +0000 (-0700)
Subject: Merge "Fix size negotiation for ScrollBar" into tizen
X-Git-Tag: accepted/tizen/common/20150529.134100~2
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=e1dfaa0c7f709144fd5018a73e78842e61708433;hp=7c5cd5665d3b4648fed0a8b0a67522cdb48885cf

Merge "Fix size negotiation for ScrollBar" into tizen
---

diff --git a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
index f1573b6..e957d0b 100755
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -446,7 +446,7 @@ void ScrollBar::OnControlSizeSet( const Vector3& size )
 {
   if(mIndicatorHeightPolicy == Toolkit::ScrollBar::Fixed)
   {
-    mIndicator.SetSize(Self().GetCurrentSize().width, mIndicatorFixedHeight);
+    mIndicator.SetSize(size.width, mIndicatorFixedHeight);
   }
 }