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
Initially show scroll indicator for a brief period
[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
069d5b6
..
3063cbc
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
@@
-26,6
+26,7
@@
#include <dali/public-api/events/touch-data.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
#include <dali/public-api/events/touch-data.h>
#include <dali/public-api/object/type-registry.h>
#include <dali/public-api/object/type-registry-helper.h>
+#include <dali/public-api/object/property-map.h>
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
#include <dali/integration-api/debug.h>
// INTERNAL INCLUDES
@@
-1986,8
+1987,9
@@
void ScrollView::OnChildAdd(Actor& child)
if( mTransientScrollBar )
{
if( mTransientScrollBar )
{
- scrollBar.SetVisible( false );
- scrollBar.HideIndicator();
+ // Show the scroll-indicator for a brief period
+ Property::Map emptyMap;
+ scrollBar.DoAction( "ShowTransientIndicator", emptyMap );
}
}
else if(mAlterChild)
}
}
else if(mAlterChild)
@@
-2495,7
+2497,6
@@
void ScrollView::OnPan( const PanGesture& gesture )
if( ( rulerDomainX.max > size.width ) || ( rulerDomainY.max > size.height ) )
{
if( ( rulerDomainX.max > size.width ) || ( rulerDomainY.max > size.height ) )
{
- scrollBar.SetVisible( true );
scrollBar.ShowIndicator();
}
}
scrollBar.ShowIndicator();
}
}