X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fcursor-helper-functions.cpp;h=f437b8d4ca644b47bc69a84ce21ce76c01ee59ed;hp=91b6a406ab5f883e7ebeaf22de36c33ff98ece8f;hb=204a8ff506d634e38af6838009f55fa5e07118fe;hpb=5177de187f2bb2736603cbd10f99e3a50084ebc7 diff --git a/dali-toolkit/internal/text/cursor-helper-functions.cpp b/dali-toolkit/internal/text/cursor-helper-functions.cpp index 91b6a40..f437b8d 100644 --- a/dali-toolkit/internal/text/cursor-helper-functions.cpp +++ b/dali-toolkit/internal/text/cursor-helper-functions.cpp @@ -467,6 +467,13 @@ CharacterIndex GetClosestCursorIndex( VisualModelPtr visualModel, void GetCursorPosition( GetCursorPositionParameters& parameters, CursorInfo& cursorInfo ) { + const LineRun* const modelLines = parameters.visualModel->mLines.Begin(); + if( NULL == modelLines ) + { + // Nothing to do. + return; + } + // Whether the logical cursor position is at the end of the whole text. const bool isLastPosition = parameters.logicalModel->mText.Count() == parameters.logical; @@ -476,8 +483,6 @@ void GetCursorPosition( GetCursorPositionParameters& parameters, // Whether the cursor is in the last position and the last position is a new paragraph character. const bool isLastNewParagraph = parameters.isMultiline && isLastPosition && TextAbstraction::IsNewParagraph( *( parameters.logicalModel->mText.Begin() + characterOfLine ) ); - const LineRun* const modelLines = parameters.visualModel->mLines.Begin(); - const LineIndex lineIndex = parameters.visualModel->GetLineOfCharacter( characterOfLine ); const LineRun& line = *( modelLines + lineIndex ); @@ -665,7 +670,6 @@ void GetCursorPosition( GetCursorPositionParameters& parameters, // Set the primary cursor's height. cursorInfo.primaryCursorHeight = cursorInfo.isSecondaryCursor ? 0.5f * glyphMetrics.fontHeight : glyphMetrics.fontHeight; - cursorInfo.glyphOffset = line.ascender - glyphMetrics.ascender; // Set the primary cursor's position. cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + primaryPosition.x + glyphAdvance;