From: Kimmo Hoikka <kimmo.hoikka@samsung.com>
Date: Thu, 28 Aug 2014 10:04:54 +0000 (-0700)
Subject: Merge "Fix text input scrolling when the controll is too small." into tizen
X-Git-Tag: dali_1.0.8~16
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=369e65bb8f37d1d84934e6edc3a5981c07396320;hp=eda1c11474808082ecae82a27640ad0aa7867d6e

Merge "Fix text input scrolling when the controll is too small." into tizen
---

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;
   }