From: Paul Wisbey <p.wisbey@samsung.com>
Date: Thu, 31 Mar 2016 13:58:36 +0000 (-0700)
Subject: Merge "Fix for text cursor." into devel/master
X-Git-Tag: dali_1.1.28~1
X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=commitdiff_plain;h=12b5da1b6e2e4b88f3cdb24b81d1b54b68b5f4f1;hp=0695455c9e382f0b19d9e1062a384c32b91f0a38

Merge "Fix for text cursor." into devel/master
---

diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp
index a2fec9a..153a36c 100644
--- a/dali-toolkit/internal/text/text-controller.cpp
+++ b/dali-toolkit/internal/text/text-controller.cpp
@@ -1327,6 +1327,11 @@ bool Controller::DoRelayout( const Size& size,
 
     if( 0u == numberOfGlyphs )
     {
+      if( UPDATE_ACTUAL_SIZE & operations )
+      {
+        mImpl->mVisualModel->SetLayoutSize( Size::ZERO );
+      }
+
       // Nothing else to do if there is no glyphs.
       DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n" );
       return true;