Merge pull request #13537 from neokim/fix_issue_13516

Fix issue 13516

cocos/ui/UIScrollView.cpp

@@ -210,6 +210,8 @@ void ScrollView::setInnerContainerSize(const Size &size)
         pos.y = _contentSize.height - (1.0f - _innerContainer->getAnchorPoint().y) * _innerContainer->getContentSize().height;
     }
     setInnerContainerPosition(pos);
+    
+    updateScrollBar(Vec2::ZERO);
 }
 
 const Size& ScrollView::getInnerContainerSize() const

cocos/ui/UIScrollViewBar.cpp

@@ -37,6 +37,7 @@ static const char* BODY_IMAGE_1_PIXEL_HEIGHT = "iVBORw0KGgoAAAANSUhEUgAAAAwAAAAB
 static const Color3B DEFAULT_COLOR(52, 65, 87);
 static const float DEFAULT_MARGIN = 20;
 static const float DEFAULT_AUTO_HIDE_TIME = 0.2f;
+static const float DEFAULT_SCROLLBAR_OPACITY = 0.4f;
 
 static Sprite* createSpriteFromBase64(const char* base64String)
 {
@@ -65,7 +66,7 @@ _direction(direction),
 _upperHalfCircle(nullptr),
 _lowerHalfCircle(nullptr),
 _body(nullptr),
-_opacity(100),
+_opacity(255 * DEFAULT_SCROLLBAR_OPACITY),
 _marginFromBoundary(DEFAULT_MARGIN),
 _marginForLength(DEFAULT_MARGIN),
 _touching(false),
@@ -197,7 +198,12 @@ void ScrollViewBar::onEnter()
 
 void ScrollViewBar::update(float deltaTime)
 {
-    if(!_autoHideEnabled || _autoHideRemainingTime <= 0)
+    processAutoHide(deltaTime);
+}
+    
+void ScrollViewBar::processAutoHide(float deltaTime)
+{
+   if(!_autoHideEnabled || _autoHideRemainingTime <= 0)
     {
         return;
     }

cocos/ui/UIScrollViewBar.h

@@ -153,6 +153,7 @@ private:
     Vec2 calculatePosition(float innerContainerMeasure, float scrollViewMeasure, float innerContainerPosition, float outOfBoundaryValue, float actualLength);
     
     void updateLength(float length);
+    void processAutoHide(float deltaTime);
     
     ScrollView* _parent;
     ScrollView::Direction _direction;