Merge "Fix for grab/selection handle." into devel/master

diff --combined dali-toolkit/internal/text/text-controller-impl.cpp
index 5dc17a4,8cd47c5..0c6b2b7
--- 1/dali-toolkit/internal/text/text-controller-impl.cpp
--- 2/dali-toolkit/internal/text/text-controller-impl.cpp
+++ b/dali-toolkit/internal/text/text-controller-impl.cpp
@@@ -1228,6 -1228,7 +1228,7 @@@ CharacterIndex Controller::Impl::GetClo
  
    // Get the glyphs per character table.
    const Length* const glyphsPerCharacterBuffer = mVisualModel->mGlyphsPerCharacter.Begin();
+   const Length* const charactersPerGlyphBuffer = mVisualModel->mCharactersPerGlyph.Begin();
  
    // If the vector is void, there is no right to left characters.
    const bool hasRightToLeftCharacters = NULL != visualToLogicalBuffer;
@@@ -1246,9 -1247,11 +1247,11 @@@
      // The character in logical order.
      const CharacterIndex characterLogicalOrderIndex = hasRightToLeftCharacters ? *( visualToLogicalBuffer + visualIndex ) : visualIndex;
  
+     // Get the script of the character.
+     const Script script = mLogicalModel->GetScript( characterLogicalOrderIndex );
+ 
      // The first glyph for that character in logical order.
      const GlyphIndex glyphLogicalOrderIndex = *( charactersToGlyphBuffer + characterLogicalOrderIndex );
- 
      // The number of glyphs for that character
      const Length numberOfGlyphs = *( glyphsPerCharacterBuffer + characterLogicalOrderIndex );
  
@@@ -1262,12 -1265,25 +1265,25 @@@
  
      const Vector2& position = *( positionsBuffer + glyphLogicalOrderIndex );
  
-     // Find the mid-point of the area containing the glyph
-     const float glyphCenter = -glyphMetrics.xBearing + position.x + 0.5f * glyphMetrics.advance;
+     // Prevents to jump the whole Latin ligatures like fi, ff, ...
+     const Length numberOfCharactersInLigature = ( TextAbstraction::LATIN == script ) ? *( charactersPerGlyphBuffer + glyphLogicalOrderIndex ) : 1u;
+     const float glyphAdvance = glyphMetrics.advance / static_cast<float>( numberOfCharactersInLigature );
+ 
+     for( GlyphIndex index = 0u; !matched && ( index < numberOfCharactersInLigature ); ++index )
+     {
+       // Find the mid-point of the area containing the glyph
+       const float glyphCenter = -glyphMetrics.xBearing + position.x + ( static_cast<float>( index ) + 0.5f ) * glyphAdvance;
+ 
+       if( visualX < glyphCenter )
+       {
+         visualIndex += index;
+         matched = true;
+         break;
+       }
+     }
  
-     if( visualX < glyphCenter )
+     if( matched )
      {
-       matched = true;
        break;
      }
    }
@@@ -1281,6 -1297,7 +1297,7 @@@
  
    logicalIndex = hasRightToLeftCharacters ? *( visualToLogicalCursorBuffer + visualIndex ) : visualIndex;
    DALI_LOG_INFO( gLogFilter, Debug::Verbose, "%p closest visualIndex %d logicalIndex %d\n", this, visualIndex, logicalIndex );
+ 
    return logicalIndex;
  }
  
@@@ -1762,6 -1779,7 +1779,6 @@@ void Controller::Impl::ScrollTextToMatc
  
    if( cursorInfo.isSecondaryCursor )
    {
 -    mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_BOTH );
      mEventData->mDecorator->SetPosition( SECONDARY_CURSOR,
                                           cursorInfo.secondaryPosition.x + offset.x,
                                           cursorInfo.secondaryPosition.y + offset.y,
@@@ -1769,24 -1787,9 +1786,24 @@@
                                           cursorInfo.lineHeight );
      DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + offset.x, cursorInfo.secondaryPosition.y + offset.y );
    }
 +
 +  // Set which cursors are active according the state.
 +  if( ( EventData::EDITING == mEventData->mState ) ||
 +      ( EventData::EDITING_WITH_POPUP == mEventData->mState ) ||
 +      ( EventData::GRAB_HANDLE_PANNING == mEventData->mState ) )
 +  {
 +    if( cursorInfo.isSecondaryCursor )
 +    {
 +      mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_BOTH );
 +    }
 +    else
 +    {
 +      mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
 +    }
 +  }
    else
    {
 -    mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
 +    mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
    }
  }