-//
-// Copyright (c) 2014 Samsung Electronics Co., Ltd.
-//
-// Licensed under the Flora License, Version 1.0 (the License);
-// you may not use this file except in compliance with the License.
-// You may obtain a copy of the License at
-//
-// http://floralicense.org/license/
-//
-// Unless required by applicable law or agreed to in writing, software
-// distributed under the License is distributed on an AS IS BASIS,
-// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-// See the License for the specific language governing permissions and
-// limitations under the License.
-//
+/*
+ * Copyright (c) 2014 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.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
#include <dali-toolkit/internal/controls/scroll-bar/scroll-bar-impl.h>
#include <dali-toolkit/internal/controls/scrollable/item-view/item-view-impl.h>
}
}
-void ScrollBar::SetBackgroundImage( Image image, const Vector4& border )
-{
- if (!mBackground )
- {
- mBackground = ImageActor::New( image );
- mBackground.SetParentOrigin( ParentOrigin::TOP_LEFT );
- mBackground.SetAnchorPoint( AnchorPoint::TOP_LEFT );
- Self().Add(mBackground);
- }
- else
- {
- mBackground.SetImage(image);
- }
-
- mBackground.SetNinePatchBorder( border );
- mBackground.SetStyle( ImageActor::STYLE_NINE_PATCH );
-}
-
-void ScrollBar::SetIndicatorImage( Image image, const Vector4& border )
+void ScrollBar::SetIndicatorImage( Image image )
{
mIndicator.SetImage(image);
- mIndicator.SetNinePatchBorder( border );
- mIndicator.SetStyle( ImageActor::STYLE_NINE_PATCH );
}
Actor ScrollBar::GetScrollIndicator()
{
if( mScrollConnector )
{
- Actor self = Self();
-
Constraint constraint;
if(mIndicatorSizeConstraint)
{
- self.RemoveConstraint(mIndicatorSizeConstraint);
+ mIndicator.RemoveConstraint(mIndicatorSizeConstraint);
}
// Set indicator height according to the indicator's height policy
if(mIndicatorPositionConstraint)
{
- self.RemoveConstraint(mIndicatorPositionConstraint);
+ mIndicator.RemoveConstraint(mIndicatorPositionConstraint);
}
constraint = Constraint::New<Vector3>( Actor::POSITION,
void ScrollBar::OnScrollPositionNotified(PropertyNotification& source)
{
// Emit the signal to notify the scroll position crossing
- mScrollPositionNotifiedSignal.Emit(mScrollPositionObject.GetProperty<float>( Toolkit::ScrollConnector::SCROLL_POSITION ));
+ mScrollPositionNotifiedSignal.Emit(mScrollConnector.GetScrollPosition());
}
void ScrollBar::Show()
bool ScrollBar::OnPanGestureProcessTick()
{
// Update the scroll position property.
- mScrollPositionObject.SetProperty( Toolkit::ScrollConnector::SCROLL_POSITION, mCurrentScrollPosition );
-
- Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(Self().GetParent());
- if(itemView)
+ if( mScrollConnector )
{
- // Refresh ItemView immediately when the scroll position is changed.
- GetImpl(itemView).DoRefresh(mCurrentScrollPosition, false); // No need to cache extra items.
+ mScrollConnector.SetScrollPosition(mCurrentScrollPosition);
}
return true;
void ScrollBar::OnPan( PanGesture gesture )
{
- if(mScrollPositionObject)
+ if(mScrollConnector)
{
+ Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(Self().GetParent());
+
switch(gesture.state)
{
case Gesture::Started:
}
Show();
- mScrollStart = mScrollPositionObject.GetProperty<float>( Toolkit::ScrollConnector::SCROLL_POSITION );
+ mScrollStart = mScrollConnector.GetScrollPosition();
mGestureDisplacement = Vector3::ZERO;
mIsPanning = true;
mTimer.Reset();
}
+ if(itemView)
+ {
+ // Refresh the ItemView cache with extra items
+ GetImpl(itemView).DoRefresh(mCurrentScrollPosition, true);
+ }
+
break;
}
}
- Dali::Toolkit::ItemView itemView = Dali::Toolkit::ItemView::DownCast(Self().GetParent());
if(itemView)
{
// Disable automatic refresh in ItemView during fast scrolling