From dfea70e6c74641c6f0b64a312b9f89c75e25bc36 Mon Sep 17 00:00:00 2001 From: "minho.sun" Date: Thu, 26 Jan 2017 15:37:14 +0900 Subject: [PATCH] Add style name to indicator of ScrollBar Add style name to indicator of scrollbar. Now developer can set their indicator style via stylesheet Change-Id: Ifc6007147472ae7cc13161cc25c3c53eec5c11b0 Signed-off-by: minho.sun --- automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp | 5 +++++ dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp | 9 ++++++++- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp index ea50a30..ded233f 100644 --- a/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp +++ b/automated-tests/src/dali-toolkit/utc-Dali-ScrollBar.cpp @@ -470,6 +470,11 @@ int UtcDaliToolkitScrollBarSetScrollIndicatorP(void) DALI_TEST_CHECK( indicator != scrollBar.GetScrollIndicator() ); DALI_TEST_CHECK( newIndicator == scrollBar.GetScrollIndicator() ); + // Check that the new control indicator is successfully set + Control controlIndicator = Control::New(); + scrollBar.SetScrollIndicator(controlIndicator); + + DALI_TEST_CHECK( controlIndicator == Control::DownCast( scrollBar.GetScrollIndicator() ) ); END_TEST; } 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 6e301cb..ddf5738 100755 --- a/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp +++ b/dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.cpp @@ -234,7 +234,7 @@ void ScrollBar::CreateDefaultIndicatorActor() Toolkit::ImageView indicator = Toolkit::ImageView::New( DEFAULT_INDICATOR_IMAGE_PATH ); indicator.SetParentOrigin( ParentOrigin::TOP_LEFT ); indicator.SetAnchorPoint( AnchorPoint::TOP_LEFT ); - + indicator.SetStyleName( "ScrollBarIndicator" ); SetScrollIndicator(indicator); } @@ -249,6 +249,13 @@ void ScrollBar::SetScrollIndicator( Actor indicator ) Self().Remove( mIndicator ); } mIndicator = indicator; + + Toolkit::Control control = Toolkit::Control::DownCast( mIndicator ); + if( control ) + { + control.SetStyleName( "ScrollBarIndicator" ); + } + mIndicatorFirstShow = true; Self().Add( mIndicator ); -- 2.7.4