projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Fix for ItemView OVERSHOOT_SIZE
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
scrollable
/
scroll-view
/
scroll-view-impl.cpp
diff --git
a/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
b/dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
index
67ce127
..
3330f13
100644
(file)
--- a/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
+++ b/
dali-toolkit/internal/controls/scrollable/scroll-view/scroll-view-impl.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 201
5
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-624,7
+624,7
@@
Dali::Toolkit::ScrollView ScrollView::New()
}
ScrollView::ScrollView()
}
ScrollView::ScrollView()
-: ScrollBase( ControlBehaviour( REQUIRES_WHEEL_EVENTS ) ), // Enable size negotiation
+: ScrollBase( ControlBehaviour( REQUIRES_WHEEL_EVENTS
| DISABLE_STYLE_CHANGE_SIGNALS
) ), // Enable size negotiation
mTouchDownTime(0u),
mGestureStackDepth(0),
mScrollStateFlags(0),
mTouchDownTime(0u),
mGestureStackDepth(0),
mScrollStateFlags(0),
@@
-701,8
+701,6
@@
void ScrollView::OnInitialize()
void ScrollView::OnStageConnection( int depth )
{
void ScrollView::OnStageConnection( int depth )
{
- ScrollBase::OnStageConnection( depth );
-
DALI_LOG_SCROLL_STATE("[0x%X]", this);
if ( mSensitive )
DALI_LOG_SCROLL_STATE("[0x%X]", this);
if ( mSensitive )
@@
-710,11
+708,14
@@
void ScrollView::OnStageConnection( int depth )
SetScrollSensitive( false );
SetScrollSensitive( true );
}
SetScrollSensitive( false );
SetScrollSensitive( true );
}
+
if(IsOvershootEnabled())
{
// try and make sure property notifications are set
EnableScrollOvershoot(true);
}
if(IsOvershootEnabled())
{
// try and make sure property notifications are set
EnableScrollOvershoot(true);
}
+
+ ScrollBase::OnStageConnection( depth );
}
void ScrollView::OnStageDisconnection()
}
void ScrollView::OnStageDisconnection()
@@
-1780,6
+1781,15
@@
void ScrollView::RemoveOverlay(Actor actor)
mInternalActor.Remove( actor );
}
mInternalActor.Remove( actor );
}
+void ScrollView::SetOvershootSize( const Vector2& size )
+{
+ mOvershootSize = size;
+ if( IsOvershootEnabled() && mOvershootIndicator )
+ {
+ mOvershootIndicator->AttachToScrollable(*this);
+ }
+}
+
void ScrollView::SetOvershootEffectColor( const Vector4& color )
{
mOvershootEffectColor = color;
void ScrollView::SetOvershootEffectColor( const Vector4& color )
{
mOvershootEffectColor = color;
@@
-1941,6
+1951,8
@@
void ScrollView::OnSizeSet( const Vector3& size )
{
mOvershootIndicator->Reset();
}
{
mOvershootIndicator->Reset();
}
+
+ ScrollBase::OnSizeSet( size );
}
void ScrollView::OnChildAdd(Actor& child)
}
void ScrollView::OnChildAdd(Actor& child)