From 6137113ec3ddc10607465f305098ed1dd4b45dcd Mon Sep 17 00:00:00 2001 From: Francisco Santos Date: Tue, 26 Aug 2014 15:12:58 +0100 Subject: [PATCH] Fix text input scrolling when the controll is too small. Change-Id: Ie18f3cfdc42a4d2059a3fa8948eaf9f3cf79d904 --- base/dali-toolkit/internal/controls/text-input/text-input-impl.cpp | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) 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 --- 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; } - 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; } -- 2.7.4