From: Richard Huang <r.huang@samsung.com>
Date: Wed, 23 Apr 2014 11:09:02 +0000 (+0100)
Subject: Fixed scroll bar disabling issue in gallery app
X-Git-Tag: dali-2014-wk20-release~35
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=77aecaf3903cb08ea1eea8da87a19eaa02a2a54b

Fixed scroll bar disabling issue in gallery app

[Issue]
[Problem] Scroll bar in ScrollView is shown when it shouldn't. It cannot be disabled
          even when Scrollable::DisableScrollComponent is called.
[Cause] The images for scroll indicator are not removed when scroll bar is disabled.
[Solution] Remove the scroll indicator images when the scroll bar is disconnected
           from scroll view.

Change-Id: I01ff966ad1484b23db5000dd48184fdb2ebe653e
Signed-off-by: David Steele <david.steele@partner.samsung.com>
---

diff --git a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
index d122835..d99e5e1 100644
--- a/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
+++ b/dali-toolkit/internal/controls/scrollable/scrollable-impl.cpp
@@ -131,6 +131,9 @@ void Scrollable::DisableScrollComponent(Toolkit::Scrollable::ScrollComponentType
   {
     ScrollComponentPtr component = pair->second;
 
+    // Disconnect the scroll component first.
+    component->OnDisconnect();
+
     // Destroy ScrollComponent.
     mComponents.erase( type );
   }
diff --git a/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h b/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
index 1cb2354..4e17af6 100644
--- a/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
+++ b/dali-toolkit/public-api/controls/scrollable/scroll-component-impl.h
@@ -55,6 +55,11 @@ public:
    */
   Toolkit::ScrollConnector GetScrollConnector() const;
 
+  /**
+   * Called when the scroll component is disconnected from a scrollable container.
+   */
+  virtual void OnDisconnect() {}
+
 protected:
 
   /**