1. Fixed draw last space charcter, 2. Removed unnecessary clipping

Change-Id: I819629a8acaee64a61d81370c46dbc604ed9b814

diff --git a/src/graphics/text/FGrp_TextTextComposite.cpp b/src/graphics/text/FGrp_TextTextComposite.cpp
index a35e247..62178a8 100644 (file)
--- a/src/graphics/text/FGrp_TextTextComposite.cpp
+++ b/src/graphics/text/FGrp_TextTextComposite.cpp
@@ -656,7 +656,8 @@ TextComposite::Draw(_CanvasImpl& canvasImpl, Rectangle& displayRect, int startTe
        GetRegion(startTextIndex, textLength, textSize.width, textSize.height);
        if (action == TEXT_OBJECT_ACTION_TYPE_ABBREV)
        {
-               TextElement* pLastTextElement = GetElementAtTextIndex(startTextIndex + textLength - 1);
+               TextElement* pLastTextElement = null;
+               pLastTextElement = (textLength == 0) ? GetElementAtTextIndex(startTextIndex) : GetElementAtTextIndex(startTextIndex + textLength - 1);
                SysTryCatch(NID_GRP, pLastTextElement, r = E_SYSTEM, E_SYSTEM, "[E_SYSTEM] Fail to get element.");
 
                if (pLastTextElement->GetType() == TEXT_ELEMENT_TYPE_TEXT)

diff --git a/src/graphics/text/FGrp_TextTextObject.cpp b/src/graphics/text/FGrp_TextTextObject.cpp
index 98cac44..4a04b6b 100644 (file)
--- a/src/graphics/text/FGrp_TextTextObject.cpp
+++ b/src/graphics/text/FGrp_TextTextObject.cpp
@@ -592,8 +592,6 @@ CONTINUE_PROC:
                        targetBounds.width = lineBounds.width;
                        targetBounds.height = lineBounds.height;
 
-                       pCanvas->SetClipBounds(targetBounds);
-
                        slidingRect = targetBounds;
 
                        slidingRect.x += __pTextColumn->GetSlidingPosition();