Revert "[3.0] Moved regular scrollbar image url into stylesheet"

This reverts commit 06ce512a5bbfcac3ee3bf00ee578f2518f92deae.

Change-Id: Id1981ed71d7fec5d57194572e2196dda79a33ef2

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 513734a..445e344 100755 (executable)
--- 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) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2016 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,6 +37,7 @@ 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);
@@ -230,16 +231,12 @@ void ScrollBar::SetScrollPropertySource( Handle handle, Property::Index property
 
 void ScrollBar::CreateDefaultIndicatorActor()
 {
-  Toolkit::ImageView indicator = Toolkit::ImageView::New();
+  Toolkit::ImageView indicator = Toolkit::ImageView::New( DEFAULT_INDICATOR_IMAGE_PATH );
   indicator.SetParentOrigin( ParentOrigin::TOP_LEFT );
   indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT );
-  indicator.SetStyleName( "ScrollBarIndicator" );
-  mIndicator = indicator;
-  Self().Add( mIndicator );
 
-  EnableGestureDetection( Gesture::Type( Gesture::Pan ) );
-  PanGestureDetector detector( GetPanGestureDetector() );
-  detector.Attach( mIndicator );
+  indicator.SetColorMode( USE_OWN_MULTIPLY_PARENT_COLOR );
+  SetScrollIndicator(indicator);
 }
 
 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 a35571b..fd262df 100644 (file)
--- a/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
+++ b/dali-toolkit/styles/480x800/dali-toolkit-default-theme.json
@@ -124,15 +124,7 @@
     "ScrollBar":
     {
       "indicatorShowDuration":0.25,
-      "indicatorHideDuration":0.25
-    },
-    "ScrollBarIndicator":
-    {
-      "image":
-      {
-        "visualType":"IMAGE",
-        "url":"{DALI_IMAGE_DIR}popup_scroll.9.png"
-      },
+      "indicatorHideDuration":0.25,
       "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 5bf5b3f..2ffc3a7 100644 (file)
Binary files a/dali-toolkit/styles/images-common/popup_scroll.9.png and b/dali-toolkit/styles/images-common/popup_scroll.9.png differ