From: Paul Wisbey <p.wisbey@samsung.com>
Date: Sun, 17 May 2015 10:54:34 +0000 (-0700)
Subject: Merge "Fix for cursor.   Avoid the jump of the grab handle when there is a mix of... 
X-Git-Tag: accepted/tizen/common/20150529.134100~28
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=074b05f53f89491982b2d5380cab7f05b1932a76;hp=005f449f3648e36e0cc997735b58b0ebb7a6390b

Merge "Fix for cursor.   Avoid the jump of the grab handle when there is a mix of rtl and ltr text." into tizen
---

diff --git a/dali-toolkit/internal/text/logical-model-impl.cpp b/dali-toolkit/internal/text/logical-model-impl.cpp
index 5a43e35..2faca97 100644
--- a/dali-toolkit/internal/text/logical-model-impl.cpp
+++ b/dali-toolkit/internal/text/logical-model-impl.cpp
@@ -502,7 +502,7 @@ void LogicalModel::SetVisualToLogicalMap( const BidirectionalLineInfoRun* const
       if( bidirectionalParagraph &&
           ( bidirectionalParagraph->characterRun.characterIndex == index ) )
       {
-        isRightToLeftParagraph = true;
+        isRightToLeftParagraph = *( modelCharacterDirections + index );
       }
 
       if( 0u == index )
diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index 8c3731a..6400370 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -862,7 +862,7 @@ bool Controller::DoRelayout( const Size& size,
     layoutSize = mImpl->mVisualModel->GetActualSize();
   }
 
-  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated %s\n", ( viewUpdated ? "true" : "false" ) );
+  DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) );
   return viewUpdated;
 }