From 06ce512a5bbfcac3ee3bf00ee578f2518f92deae Mon Sep 17 00:00:00 2001
From: Nick Holland <nick.holland@partner.samsung.com>
Date: Wed, 15 Feb 2017 19:08:02 +0000
Subject: [PATCH] [3.0] Moved regular scrollbar image url into stylesheet

Change-Id: Ie4d333671d7e45bce6ee259c9bd29435e285d748
---
 .../internal/controls/scroll-bar/scroll-bar-impl.cpp    |  13 ++++++++-----
 .../styles/480x800/dali-toolkit-default-theme.json      |  10 +++++++++-
 dali-toolkit/styles/images-common/popup_scroll.9.png    | Bin 485 -> 227 bytes
 3 files changed, 17 insertions(+), 6 deletions(-)

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 445e344..513734a 100755
--- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
+++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2017 Samsung Electronics Co., Ltd.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -37,7 +37,6 @@ using namespace Dali;
 namespace
 {
 
-const char* DEFAULT_INDICATOR_IMAGE_PATH = DALI_IMAGE_DIR "popup_scroll.9.png";
 const float DEFAULT_SLIDER_DEPTH(1.0f);
 const float DEFAULT_INDICATOR_SHOW_DURATION(0.5f);
 const float DEFAULT_INDICATOR_HIDE_DURATION(0.5f);
@@ -231,12 +230,16 @@ void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index property
 
 void ScrollBar::CreateDefaultIndicatorActor()
 {
-  Toolkit::ImageView indicator = Toolkit::ImageView::New( DEFAULT_INDICATOR_IMAGE_PATH );
+  Toolkit::ImageView indicator = Toolkit::ImageView::New();
   indicator.SetParentOrigin( ParentOrigin::TOP_LEFT );
   indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT );
+  indicator.SetStyleName( "ScrollBarIndicator" );
+  mIndicator = indicator;
+  Self().Add( mIndicator );
 
-  indicator.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR );
-  SetScrollIndicator(indicator);
+  EnableGestureDetection( Gesture::Type( Gesture::Pan ) );
+  PanGestureDetector detector( GetPanGestureDetector() );
+  detector.Attach( mIndicator );
 }
 
 void ScrollBar::SetScrollIndicator( Actor indicator )
diff --git a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
index fd262df..a35571b 100644
--- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@ -124,7 +124,15 @@
     "ScrollBar":
     {
       "indicatorShowDuration":0.25,
-      "indicatorHideDuration":0.25,
+      "indicatorHideDuration":0.25
+    },
+    "ScrollBarIndicator":
+    {
+      "image":
+      {
+        "visualType":"IMAGE",
+        "url":"{DALI_IMAGE_DIR}popup_scroll.9.png"
+      },
       "color":[0.0,0.72,0.9,0.7]
     },
     "TextEditor":
diff --git a/dali-toolkit/styles/images-common/popup_scroll.9.png b/dali-toolkit/styles/images-common/popup_scroll.9.png
index 2ffc3a71df3b56ab63c3a36c8c8f0832fd0412e5..5bf5b3fba1dfd6987857c4755e5bcffa879d956e 100644
GIT binary patch
literal 227
zcmeAS@N?(olHy`uVBq!ia0vp^93afW1|*O0@9PFqY)RhkE)4%caKYZ?lYt_f1s;*b
z3=G`DAk4@xYmNj^kiEpy*OmP~rznS_5x>EeSfEgWr;B5V#O2)c8#$Q*1zH|Pitc>j
z!{ROAZMxTL%|WRnN0{Cm2$*pGiLL(y`>3??wwq2?p{kw%zESIpHXpq5%<!c0No@|d
zm@_dO-@YvPa(c><MXr25Q}4e$$hTep``(xHn;F^X6uk3Z5;d`O()0P|pV@-z>$X3R
S-2V({H-o3EpUXO@geCxnTT)K|

literal 485
zcmV<B0UG{^P)<h;3K|Lk000e1NJLTq000gE000#T1^@s6c3Izv0000PbVXQnQ*UN;
zcVTj606}DLVr3vnZDD6+Qe|Oed2z{QJOBUzhe<?1RCwB)lrc-gKorM&muRbPRaA%+
z92`1|<SRJ&0R#u<_DhHk3Vw;s?g}oQ0@(yN7l$sAqG(gAMr*W5<NvkqB(x<p9{iHr
z<$iZBckd#iD9Q*SqD;C1V<=`SmC7O-j=?@y0c~&w4r{gA+lUwq#A>y=fQk*aMu*1x
z8^>|B>-BmE)jl;5lHVUpl7=yfO~Wvb@Hh{2YNB=}?j?PYuIszFEyv{H1!X-+)HH1k
zH-oETT$IyRkr(U>bpIm6OCA(JHmx`VW>u6j#pYAEnwl)lj3Qo9Vt<M>7L`P1&`8ZB
ztJmvw#zeXVL2#ZVwpy+0(OCy#qtQ4G!|-;J<okZpw(Uz6L-kqebmYqA@`h=eC&glM
zM@pH;KwZ~$uPn>D@I3DweP6)?xC4$7X@BTgl?ccsbXF@#Gx^{d+%r!~r2U!Ww4$6`
z<xJ5yybs`lM?R;X5(Q@jbzWi$+!g=|^@X89zJLD!92RxV@$A{yjFjA;95M~m7ytd|
b{0J}rjysIUuBHG500000NkvXXu0mjf;8fAt

-- 
2.7.4