Merge "Remove unused conditional in TextController" into devel/master
authorHyunJu Shin <hyunjushin@samsung.com>
Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)
committerGerrit Code Review <gerrit@review.ap-northeast-2.compute.internal>
Tue, 12 Dec 2017 10:17:02 +0000 (10:17 +0000)
1  2 
dali-toolkit/internal/text/text-controller.cpp

@@@ -2105,15 -2105,8 +2105,15 @@@ void Controller::GetPlaceholderProperty
  
  Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection()
  {
 -  const LineRun* const firstline = mImpl->mModel->mVisualModel->mLines.Begin();
 -  if ( firstline && firstline->direction )
 +  if( ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) )
 +  {
 +    return Toolkit::DevelText::TextDirection::LEFT_TO_RIGHT;
 +  }
 +
 +  const Character character = mImpl->mModel->mLogicalModel->mText[0];
 +  Script script = TextAbstraction::GetCharacterScript( character );
 +
 +  if( TextAbstraction::IsRightToLeftScript( script ) )
    {
      return Toolkit::DevelText::TextDirection::RIGHT_TO_LEFT;
    }
@@@ -3704,7 -3697,7 +3704,7 @@@ bool Controller::DeleteEvent( int keyCo
                            1,
                            UPDATE_INPUT_STYLE );
    }
-   else if( ( mImpl->mEventData->mPrimaryCursorPosition >= 0 ) && ( keyCode == Dali::DevelKey::DALI_KEY_DELETE ) )
+   else if( keyCode == Dali::DevelKey::DALI_KEY_DELETE )
    {
      // Remove the character after the current cursor position
      removed = RemoveText( 0,