From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 20 Aug 2015 13:50:04 +0000 (-0700)
Subject: Merge "Ensure cursor positioned at end of selection when focus restored" into devel... 
X-Git-Tag: dali_1.1.1~10
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=07337c5341cf30d8a81dd3beb57e8364cf670d71;hp=ef1cc991edb5101c921ce0ed88884da0b060bf32

Merge "Ensure cursor positioned at end of selection when focus restored" into devel/master
---

diff --git a/dali-toolkit/internal/text/text-controller-impl.cpp b/dali-toolkit/internal/text/text-controller-impl.cpp
index 7dd88e4..67eb294 100644
--- a/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@ -1053,6 +1053,9 @@ void Controller::Impl::RepositionSelectionHandles( CharacterIndex selectionStart
 
   mEventData->mDecorator->SetPosition( RIGHT_SELECTION_HANDLE, secondaryPosition.x, secondaryPosition.y, secondaryCursorInfo.lineHeight );
 
+  // Cursor to be positioned at end of selection so if selection interrupted and edit mode restarted the cursor will be at end of selection
+  mEventData->mPrimaryCursorPosition = (indicesSwapped)?mEventData->mLeftSelectionPosition:mEventData->mRightSelectionPosition;
+
   // Set the flag to update the decorator.
   mEventData->mDecoratorUpdated = true;
 }