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 text input scrolling when the controll is too small.
[platform/core/uifw/dali-toolkit.git]
/
base
/
dali-toolkit
/
internal
/
controls
/
text-input
/
text-input-impl.cpp
diff --git
a/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
b/base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
index
7a0729c
..
44c5aaf
100644
(file)
--- a/
base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
+++ b/
base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp
@@
-1951,11
+1951,7
@@
void TextInput::ScrollTextViewToMakeCursorVisible( const Vector3& cursorPosition
scrollOffset.x += cursorPosition.x;
}
scrollOffset.x += cursorPosition.x;
}
- if( cursorPosition.y - cursorSize.height < 0.f )
- {
- scrollOffset.y += ( cursorPosition.y - cursorSize.height );
- }
- else if( cursorPosition.y > controlSize.height )
+ if( cursorPosition.y - cursorSize.height < 0.f || cursorPosition.y > controlSize.height )
{
scrollOffset.y += cursorPosition.y;
}
{
scrollOffset.y += cursorPosition.y;
}