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
Text's selection popup mirroring.
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
controls
/
text-controls
/
text-selection-toolbar-impl.cpp
diff --git
a/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
b/dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
index
957e152
..
612ca8b
100644
(file)
--- a/
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
+++ b/
dali-toolkit/internal/controls/text-controls/text-selection-toolbar-impl.cpp
@@
-280,11
+280,16
@@
void TextSelectionToolbar::SetUpScrollBar( bool enable )
void TextSelectionToolbar::OnScrollStarted( const Vector2& position )
{
void TextSelectionToolbar::OnScrollStarted( const Vector2& position )
{
+ if( mFirstScrollEnd )
+ {
+ mScrollView.SetOvershootEnabled( true );
+ }
mTableOfButtons.SetSensitive( false );
}
void TextSelectionToolbar::OnScrollCompleted( const Vector2& position )
{
mTableOfButtons.SetSensitive( false );
}
void TextSelectionToolbar::OnScrollCompleted( const Vector2& position )
{
+ mFirstScrollEnd = true;
mTableOfButtons.SetSensitive( true );
}
mTableOfButtons.SetSensitive( true );
}
@@
-327,6
+332,13
@@
void TextSelectionToolbar::SetScrollBarPadding( const Vector2& padding )
RelayoutRequest();
}
RelayoutRequest();
}
+void TextSelectionToolbar::ScrollTo( const Vector2& position )
+{
+ mFirstScrollEnd = false;
+ mScrollView.SetOvershootEnabled( false );
+ mScrollView.ScrollTo( position, 0.f );
+}
+
void TextSelectionToolbar::ConfigureScrollview( const Property::Map& properties )
{
// Set any properties specified for the label by iterating through all property key-value pairs.
void TextSelectionToolbar::ConfigureScrollview( const Property::Map& properties )
{
// Set any properties specified for the label by iterating through all property key-value pairs.
@@
-369,7
+381,8
@@
TextSelectionToolbar::TextSelectionToolbar()
mMaxSize (),
mScrollBarPadding( DEFAULT_SCROLL_BAR_PADDING ),
mIndexInTable( 0 ),
mMaxSize (),
mScrollBarPadding( DEFAULT_SCROLL_BAR_PADDING ),
mIndexInTable( 0 ),
- mDividerIndexes()
+ mDividerIndexes(),
+ mFirstScrollEnd( false )
{
}
{
}