/*
- * Copyright (c) 2017 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2021 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.
#include <dali-toolkit/internal/controls/scrollable/scroll-view/scroll-overshoot-indicator-impl.h>
// INTERNAL INCLUDES
-#include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
#include <dali-toolkit/internal/controls/scrollable/bouncing-effect-actor.h>
+#include <dali-toolkit/internal/controls/scrollable/scrollable-impl.h>
#include <dali-toolkit/public-api/controls/scrollable/scroll-view/scroll-view.h>
using namespace Dali;
namespace
{
-
const float OVERSHOOT_BOUNCE_ACTOR_RESIZE_THRESHOLD = 180.0f;
// local helper function to resize the height of the bounce actor
-float GetBounceActorHeight( float width, float defaultHeight )
+float GetBounceActorHeight(float width, float defaultHeight)
{
return (width > OVERSHOOT_BOUNCE_ACTOR_RESIZE_THRESHOLD) ? defaultHeight : defaultHeight * 0.5f;
}
-const float MAX_OVERSHOOT_NOTIFY_AMOUNT = 0.99f; // maximum amount to set notification for increased overshoot, beyond this we just wait for it to reduce again
-const float MIN_OVERSHOOT_NOTIFY_AMOUNT = Math::MACHINE_EPSILON_0; // minimum amount to set notification for reduced overshoot, beyond this we just wait for it to increase again
-const float OVERSHOOT_NOTIFY_STEP = 0.01f; // amount to set notifications beyond current overshoot value
+const float MAX_OVERSHOOT_NOTIFY_AMOUNT = 0.99f; // maximum amount to set notification for increased overshoot, beyond this we just wait for it to reduce again
+const float MIN_OVERSHOOT_NOTIFY_AMOUNT = Math::MACHINE_EPSILON_0; // minimum amount to set notification for reduced overshoot, beyond this we just wait for it to increase again
+const float OVERSHOOT_NOTIFY_STEP = 0.01f; // amount to set notifications beyond current overshoot value
-}
+} // namespace
namespace Dali
{
-
namespace Toolkit
{
-
namespace Internal
{
-
-ScrollOvershootIndicator::ScrollOvershootIndicator() :
- mEffectX(NULL),
+ScrollOvershootIndicator::ScrollOvershootIndicator()
+: mEffectX(NULL),
mEffectY(NULL)
{
}
ScrollOvershootIndicator::~ScrollOvershootIndicator()
{
-
}
ScrollOvershootIndicator* ScrollOvershootIndicator::New()
mEffectY->Reset();
}
-void ScrollOvershootIndicator::SetOvershootEffectColor( const Vector4& color )
+void ScrollOvershootIndicator::SetOvershootEffectColor(const Vector4& color)
{
if(mEffectX)
{
}
}
-ScrollOvershootEffect::ScrollOvershootEffect( bool vertical ) :
- mVertical(vertical)
+ScrollOvershootEffect::ScrollOvershootEffect(bool vertical)
+: mVertical(vertical)
{
-
}
bool ScrollOvershootEffect::IsVertical() const
return mVertical;
}
-ScrollOvershootEffectRipple::ScrollOvershootEffectRipple( bool vertical, Scrollable& scrollable ) :
- ScrollOvershootEffect( vertical ),
- mAttachedScrollView(scrollable),
- mOvershootProperty(Property::INVALID_INDEX),
- mEffectOvershootProperty(Property::INVALID_INDEX),
- mOvershoot(0.0f),
- mOvershootSize( scrollable.GetOvershootSize() ),
- mAnimationStateFlags(0)
+ScrollOvershootEffectRipple::ScrollOvershootEffectRipple(bool vertical, Scrollable& scrollable)
+: ScrollOvershootEffect(vertical),
+ mAttachedScrollView(scrollable),
+ mOvershootProperty(Property::INVALID_INDEX),
+ mEffectOvershootProperty(Property::INVALID_INDEX),
+ mOvershoot(0.0f),
+ mOvershootSize(scrollable.GetOvershootSize()),
+ mAnimationStateFlags(0)
{
mOvershootOverlay = CreateBouncingEffectActor(mEffectOvershootProperty);
- mOvershootOverlay.SetProperty( Actor::Property::COLOR,mAttachedScrollView.GetOvershootEffectColor());
- mOvershootOverlay.SetProperty( Actor::Property::PARENT_ORIGIN,ParentOrigin::TOP_LEFT );
- mOvershootOverlay.SetProperty( Actor::Property::ANCHOR_POINT,AnchorPoint::TOP_LEFT);
- mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,false);
-
+ mOvershootOverlay.SetProperty(Actor::Property::COLOR, mAttachedScrollView.GetOvershootEffectColor());
+ mOvershootOverlay.SetProperty(Actor::Property::PARENT_ORIGIN, ParentOrigin::TOP_LEFT);
+ mOvershootOverlay.SetProperty(Actor::Property::ANCHOR_POINT, AnchorPoint::TOP_LEFT);
+ mOvershootOverlay.SetProperty(Actor::Property::VISIBLE, false);
}
void ScrollOvershootEffectRipple::Apply()
{
- Actor self = mAttachedScrollView.Self();
+ Actor self = mAttachedScrollView.Self();
mOvershootProperty = IsVertical() ? Toolkit::ScrollView::Property::OVERSHOOT_Y : Toolkit::ScrollView::Property::OVERSHOOT_X;
// make sure height is set, since we only create a constraint for image width
mOvershootSize = mAttachedScrollView.GetOvershootSize();
- mOvershootOverlay.SetProperty( Actor::Property::SIZE, mOvershootSize );
+ mOvershootOverlay.SetProperty(Actor::Property::SIZE, mOvershootSize);
mAttachedScrollView.AddOverlay(mOvershootOverlay);
UpdatePropertyNotifications();
}
-void ScrollOvershootEffectRipple::Remove( Scrollable& scrollable )
+void ScrollOvershootEffectRipple::Remove(Scrollable& scrollable)
{
if(mOvershootOverlay)
{
void ScrollOvershootEffectRipple::Reset()
{
- mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,false);
- mOvershootOverlay.SetProperty( mEffectOvershootProperty, 0.f);
+ mOvershootOverlay.SetProperty(Actor::Property::VISIBLE, false);
+ mOvershootOverlay.SetProperty(mEffectOvershootProperty, 0.f);
}
void ScrollOvershootEffectRipple::UpdatePropertyNotifications()
Actor self = mAttachedScrollView.Self();
// update overshoot increase notify
- if( mOvershootIncreaseNotification )
+ if(mOvershootIncreaseNotification)
{
- self.RemovePropertyNotification( mOvershootIncreaseNotification );
+ self.RemovePropertyNotification(mOvershootIncreaseNotification);
mOvershootIncreaseNotification.Reset();
}
- if( absOvershoot < MAX_OVERSHOOT_NOTIFY_AMOUNT )
+ if(absOvershoot < MAX_OVERSHOOT_NOTIFY_AMOUNT)
{
float increaseStep = absOvershoot + OVERSHOOT_NOTIFY_STEP;
- if( increaseStep > MAX_OVERSHOOT_NOTIFY_AMOUNT )
+ if(increaseStep > MAX_OVERSHOOT_NOTIFY_AMOUNT)
{
increaseStep = MAX_OVERSHOOT_NOTIFY_AMOUNT;
}
- mOvershootIncreaseNotification = self.AddPropertyNotification( mOvershootProperty, OutsideCondition(-increaseStep, increaseStep) );
+ mOvershootIncreaseNotification = self.AddPropertyNotification(mOvershootProperty, OutsideCondition(-increaseStep, increaseStep));
mOvershootIncreaseNotification.SetNotifyMode(PropertyNotification::NOTIFY_ON_TRUE);
mOvershootIncreaseNotification.NotifySignal().Connect(this, &ScrollOvershootEffectRipple::OnOvershootNotification);
}
// update overshoot decrease notify
- if( mOvershootDecreaseNotification )
+ if(mOvershootDecreaseNotification)
{
- self.RemovePropertyNotification( mOvershootDecreaseNotification );
+ self.RemovePropertyNotification(mOvershootDecreaseNotification);
mOvershootDecreaseNotification.Reset();
}
- if( absOvershoot > MIN_OVERSHOOT_NOTIFY_AMOUNT )
+ if(absOvershoot > MIN_OVERSHOOT_NOTIFY_AMOUNT)
{
float reduceStep = absOvershoot - OVERSHOOT_NOTIFY_STEP;
- if( reduceStep < MIN_OVERSHOOT_NOTIFY_AMOUNT )
+ if(reduceStep < MIN_OVERSHOOT_NOTIFY_AMOUNT)
{
reduceStep = MIN_OVERSHOOT_NOTIFY_AMOUNT;
}
- mOvershootDecreaseNotification = self.AddPropertyNotification( mOvershootProperty, InsideCondition(-reduceStep, reduceStep) );
+ mOvershootDecreaseNotification = self.AddPropertyNotification(mOvershootProperty, InsideCondition(-reduceStep, reduceStep));
mOvershootDecreaseNotification.SetNotifyMode(PropertyNotification::NOTIFY_ON_TRUE);
mOvershootDecreaseNotification.NotifySignal().Connect(this, &ScrollOvershootEffectRipple::OnOvershootNotification);
}
}
-void ScrollOvershootEffectRipple::SetOvershootEffectColor( const Vector4& color )
+void ScrollOvershootEffectRipple::SetOvershootEffectColor(const Vector4& color)
{
if(mOvershootOverlay)
{
- mOvershootOverlay.SetProperty( Actor::Property::COLOR,color);
+ mOvershootOverlay.SetProperty(Actor::Property::COLOR, color);
}
}
-void ScrollOvershootEffectRipple::UpdateVisibility( bool visible )
+void ScrollOvershootEffectRipple::UpdateVisibility(bool visible)
{
- mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,visible);
+ mOvershootOverlay.SetProperty(Actor::Property::VISIBLE, visible);
// make sure overshoot image is correctly placed
- if( visible )
+ if(visible)
{
Actor self = mAttachedScrollView.Self();
if(mOvershoot > 0.0f)
{
// positive overshoot
- const Vector3 size = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE );
- Vector3 relativeOffset;
- const Vector3 parentSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE );
+ const Vector3 size = mOvershootOverlay.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
+ Vector3 relativeOffset;
+ const Vector3 parentSize = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
if(IsVertical())
{
- mOvershootOverlay.SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( 0.0f ), Vector3::ZAXIS ) ) );
- mOvershootOverlay.SetProperty( Actor::Property::SIZE, Vector3( parentSize.width, GetBounceActorHeight(parentSize.width, mOvershootSize.height), size.depth ) );
+ mOvershootOverlay.SetProperty(Actor::Property::ORIENTATION, Quaternion(Quaternion(Radian(0.0f), Vector3::ZAXIS)));
+ mOvershootOverlay.SetProperty(Actor::Property::SIZE, Vector3(parentSize.width, GetBounceActorHeight(parentSize.width, mOvershootSize.height), size.depth));
}
else
{
- mOvershootOverlay.SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( 1.5f * Math::PI ), Vector3::ZAXIS ) ) );
- mOvershootOverlay.SetProperty( Actor::Property::SIZE, Vector3( parentSize.height, GetBounceActorHeight(parentSize.height, mOvershootSize.height), size.depth ) );
+ mOvershootOverlay.SetProperty(Actor::Property::ORIENTATION, Quaternion(Quaternion(Radian(1.5f * Math::PI), Vector3::ZAXIS)));
+ mOvershootOverlay.SetProperty(Actor::Property::SIZE, Vector3(parentSize.height, GetBounceActorHeight(parentSize.height, mOvershootSize.height), size.depth));
relativeOffset = Vector3(0.0f, 1.0f, 0.0f);
}
- mOvershootOverlay.SetProperty( Actor::Property::POSITION, relativeOffset * parentSize );
+ mOvershootOverlay.SetProperty(Actor::Property::POSITION, relativeOffset * parentSize);
}
else
{
// negative overshoot
- const Vector3 size = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE );
- Vector3 relativeOffset;
- const Vector3 parentSize = self.GetCurrentProperty< Vector3 >( Actor::Property::SIZE );
+ const Vector3 size = mOvershootOverlay.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
+ Vector3 relativeOffset;
+ const Vector3 parentSize = self.GetCurrentProperty<Vector3>(Actor::Property::SIZE);
if(IsVertical())
{
- mOvershootOverlay.SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( Math::PI ), Vector3::ZAXIS ) ) );
- mOvershootOverlay.SetProperty( Actor::Property::SIZE, Vector3( parentSize.width, GetBounceActorHeight(parentSize.width, mOvershootSize.height), size.depth ) );
+ mOvershootOverlay.SetProperty(Actor::Property::ORIENTATION, Quaternion(Quaternion(Radian(Math::PI), Vector3::ZAXIS)));
+ mOvershootOverlay.SetProperty(Actor::Property::SIZE, Vector3(parentSize.width, GetBounceActorHeight(parentSize.width, mOvershootSize.height), size.depth));
relativeOffset = Vector3(1.0f, 1.0f, 0.0f);
}
else
{
- mOvershootOverlay.SetProperty( Actor::Property::ORIENTATION, Quaternion( Quaternion( Radian( 0.5f * Math::PI ), Vector3::ZAXIS ) ) );
- mOvershootOverlay.SetProperty( Actor::Property::SIZE, Vector3( parentSize.height, GetBounceActorHeight(parentSize.height, mOvershootSize.height), size.depth ) );
+ mOvershootOverlay.SetProperty(Actor::Property::ORIENTATION, Quaternion(Quaternion(Radian(0.5f * Math::PI), Vector3::ZAXIS)));
+ mOvershootOverlay.SetProperty(Actor::Property::SIZE, Vector3(parentSize.height, GetBounceActorHeight(parentSize.height, mOvershootSize.height), size.depth));
relativeOffset = Vector3(1.0f, 0.0f, 0.0f);
}
- mOvershootOverlay.SetProperty( Actor::Property::POSITION, relativeOffset * parentSize );
+ mOvershootOverlay.SetProperty(Actor::Property::POSITION, relativeOffset * parentSize);
}
}
}
void ScrollOvershootEffectRipple::OnOvershootNotification(PropertyNotification& source)
{
Actor self = mAttachedScrollView.Self();
- mOvershoot = self.GetCurrentProperty< float >( mOvershootProperty );
+ mOvershoot = self.GetCurrentProperty<float>(mOvershootProperty);
SetOvershoot(mOvershoot, false);
UpdatePropertyNotifications();
}
void ScrollOvershootEffectRipple::SetOvershoot(float amount, bool animate)
{
- float absAmount = fabsf(amount);
- bool animatingOn = absAmount > Math::MACHINE_EPSILON_0;
- if( (animatingOn && (mAnimationStateFlags & AnimatingIn)) )
+ float absAmount = fabsf(amount);
+ bool animatingOn = absAmount > Math::MACHINE_EPSILON_0;
+ if((animatingOn && (mAnimationStateFlags & AnimatingIn)))
{
// trying to do what we are already doing
- if( mAnimationStateFlags & AnimateBack )
+ if(mAnimationStateFlags & AnimateBack)
{
mAnimationStateFlags &= ~AnimateBack;
}
return;
}
- if( (!animatingOn && (mAnimationStateFlags & AnimatingOut)) )
+ if((!animatingOn && (mAnimationStateFlags & AnimatingOut)))
{
// trying to do what we are already doing
return;
}
- if( !animatingOn && (mAnimationStateFlags & AnimatingIn) )
+ if(!animatingOn && (mAnimationStateFlags & AnimatingIn))
{
// dont interrupt while animating on
mAnimationStateFlags |= AnimateBack;
return;
}
- if( absAmount > Math::MACHINE_EPSILON_1 )
+ if(absAmount > Math::MACHINE_EPSILON_1)
{
UpdateVisibility(true);
}
float overshootAnimationSpeed = mAttachedScrollView.Self().GetProperty<float>(Toolkit::Scrollable::Property::OVERSHOOT_ANIMATION_SPEED);
- if( animate && overshootAnimationSpeed > Math::MACHINE_EPSILON_0 )
+ if(animate && overshootAnimationSpeed > Math::MACHINE_EPSILON_0)
{
- float currentOvershoot = fabsf( mOvershootOverlay.GetProperty( mEffectOvershootProperty ).Get<float>() );
- float duration = mOvershootOverlay.GetCurrentProperty< Vector3 >( Actor::Property::SIZE ).height * (animatingOn ? (1.0f - currentOvershoot) : currentOvershoot) / overshootAnimationSpeed;
+ float currentOvershoot = fabsf(mOvershootOverlay.GetProperty(mEffectOvershootProperty).Get<float>());
+ float duration = mOvershootOverlay.GetCurrentProperty<Vector3>(Actor::Property::SIZE).height * (animatingOn ? (1.0f - currentOvershoot) : currentOvershoot) / overshootAnimationSpeed;
- if( duration > Math::MACHINE_EPSILON_0 )
+ if(duration > Math::MACHINE_EPSILON_0)
{
if(mScrollOvershootAnimation)
{
- mScrollOvershootAnimation.FinishedSignal().Disconnect( this, &ScrollOvershootEffectRipple::OnOvershootAnimFinished );
+ mScrollOvershootAnimation.FinishedSignal().Disconnect(this, &ScrollOvershootEffectRipple::OnOvershootAnimFinished);
mScrollOvershootAnimation.Stop();
mScrollOvershootAnimation.Reset();
}
mScrollOvershootAnimation = Animation::New(duration);
- mScrollOvershootAnimation.FinishedSignal().Connect( this, &ScrollOvershootEffectRipple::OnOvershootAnimFinished );
- mScrollOvershootAnimation.AnimateTo( Property(mOvershootOverlay, mEffectOvershootProperty), amount, TimePeriod(duration) );
+ mScrollOvershootAnimation.FinishedSignal().Connect(this, &ScrollOvershootEffectRipple::OnOvershootAnimFinished);
+ mScrollOvershootAnimation.AnimateTo(Property(mOvershootOverlay, mEffectOvershootProperty), amount, TimePeriod(duration));
mScrollOvershootAnimation.Play();
mAnimationStateFlags = animatingOn ? AnimatingIn : AnimatingOut;
}
}
else
{
- mOvershootOverlay.SetProperty( mEffectOvershootProperty, amount);
+ mOvershootOverlay.SetProperty(mEffectOvershootProperty, amount);
}
}
void ScrollOvershootEffectRipple::OnOvershootAnimFinished(Animation& animation)
{
bool animateOff = false;
- if( mAnimationStateFlags & AnimatingOut )
+ if(mAnimationStateFlags & AnimatingOut)
{
// should now be offscreen
- mOvershootOverlay.SetProperty( Actor::Property::VISIBLE,false);
+ mOvershootOverlay.SetProperty(Actor::Property::VISIBLE, false);
}
- if( (mAnimationStateFlags & AnimateBack) )
+ if((mAnimationStateFlags & AnimateBack))
{
animateOff = true;
}
- mScrollOvershootAnimation.FinishedSignal().Disconnect( this, &ScrollOvershootEffectRipple::OnOvershootAnimFinished );
+ mScrollOvershootAnimation.FinishedSignal().Disconnect(this, &ScrollOvershootEffectRipple::OnOvershootAnimFinished);
mScrollOvershootAnimation.Stop();
mScrollOvershootAnimation.Reset();
mAnimationStateFlags = 0;
- if( animateOff )
+ if(animateOff)
{
SetOvershoot(0.0f, true);
}
}
-ScrollOvershootEffectRipplePtr ScrollOvershootEffectRipple::New( bool vertical, Scrollable& scrollable )
+ScrollOvershootEffectRipplePtr ScrollOvershootEffectRipple::New(bool vertical, Scrollable& scrollable)
{
return new ScrollOvershootEffectRipple(vertical, scrollable);
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff