if( mImpl->mEventData )
{
// If popup shown then hide it by switching to Editing state
- if ( EventData::SELECTING == mImpl->mEventData->mState ||
- EventData::SELECTION_CHANGED == mImpl->mEventData->mState ||
- EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState )
+ if( ( EventData::SELECTING == mImpl->mEventData->mState ) ||
+ ( EventData::SELECTION_CHANGED == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) )
{
mImpl->ChangeState( EventData::EDITING );
}
}
}
+ if( mImpl->mEventData &&
+ 0 != events.size() )
+ {
+ // When the text is being modified, delay cursor blinking
+ mImpl->mEventData->mDecorator->DelayCursorBlink();
+ }
+
// Discard temporary text
events.clear();
}
mImpl->mEventData->mPrimaryCursorPosition = cursorIndex;
// Update the cursor if it's in editing mode.
- if( ( EventData::EDITING == mImpl->mEventData->mState ) ||
- ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) )
+ if( ( EventData::EDITING == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) )
{
mImpl->mEventData->mUpdateCursorPosition = true;
}
REORDER );
// Queue a cursor reposition event; this must wait until after DoRelayout()
- mImpl->mEventData->mUpdateCursorPosition = true;
- mImpl->mEventData->mScrollAfterUpdatePosition = true;
+ if( ( EventData::EDITING == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) ||
+ ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) )
+ {
+ mImpl->mEventData->mUpdateCursorPosition = true;
+ mImpl->mEventData->mScrollAfterUpdatePosition = true;
+ }
}
void Controller::TextDeletedEvent()
mImpl->mEventData->mPreEditLength = utf32Characters.Count();
mImpl->mEventData->mPreEditFlag = true;
- if( 0u != mImpl->mVisualModel->mCharactersToGlyph.Count() )
- {
- // Add the underline for the pre-edit text.
- const GlyphIndex* const charactersToGlyphBuffer = mImpl->mVisualModel->mCharactersToGlyph.Begin();
- const Length* const glyphsPerCharacterBuffer = mImpl->mVisualModel->mGlyphsPerCharacter.Begin();
-
- const GlyphIndex glyphStart = *( charactersToGlyphBuffer + mImpl->mEventData->mPreEditStartPosition );
- const CharacterIndex lastPreEditCharacter = mImpl->mEventData->mPreEditStartPosition + ( ( mImpl->mEventData->mPreEditLength > 0u ) ? mImpl->mEventData->mPreEditLength - 1u : 0u );
- const Length numberOfGlyphsLastCharacter = *( glyphsPerCharacterBuffer + lastPreEditCharacter );
- const GlyphIndex glyphEnd = *( charactersToGlyphBuffer + lastPreEditCharacter ) + ( numberOfGlyphsLastCharacter > 1u ? numberOfGlyphsLastCharacter - 1u : 0u );
-
- GlyphRun underlineRun;
- underlineRun.glyphIndex = glyphStart;
- underlineRun.numberOfGlyphs = 1u + glyphEnd - glyphStart;
-
- // TODO: At the moment the underline runs are only for pre-edit.
- mImpl->mVisualModel->mUnderlineRuns.PushBack( underlineRun );
- }
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength );
}
}
if( NULL != mImpl->mEventData )
{
- const bool isShowingPlaceholderText = mImpl->IsShowingPlaceholderText();
if( 1u == tapCount )
{
- if( !isShowingPlaceholderText &&
- ( EventData::EDITING == mImpl->mEventData->mState ) )
+ // This is to avoid unnecessary relayouts when tapping an empty text-field
+ bool relayoutNeeded( false );
+
+ if( mImpl->IsShowingRealText() &&
+ EventData::EDITING == mImpl->mEventData->mState )
{
+ // Show grab handle on second tap
mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE );
+ relayoutNeeded = true;
}
- else if( EventData::EDITING_WITH_GRAB_HANDLE != mImpl->mEventData->mState )
+ else if( EventData::EDITING != mImpl->mEventData->mState &&
+ EventData::EDITING_WITH_GRAB_HANDLE != mImpl->mEventData->mState )
{
- // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
+ // Show cursor on first tap
mImpl->ChangeState( EventData::EDITING );
+ relayoutNeeded = true;
+ }
+ else if( mImpl->IsShowingRealText() )
+ {
+ // Move the cursor
+ relayoutNeeded = true;
}
- Event event( Event::TAP_EVENT );
- event.p1.mUint = tapCount;
- event.p2.mFloat = x;
- event.p3.mFloat = y;
- mImpl->mEventData->mEventQueue.push_back( event );
+ // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated
+ if( relayoutNeeded )
+ {
+ Event event( Event::TAP_EVENT );
+ event.p1.mUint = tapCount;
+ event.p2.mFloat = x;
+ event.p3.mFloat = y;
+ mImpl->mEventData->mEventQueue.push_back( event );
- mImpl->RequestRelayout();
+ mImpl->RequestRelayout();
+ }
}
- else if( !isShowingPlaceholderText &&
- mImpl->mEventData->mSelectionEnabled &&
- ( 2u == tapCount ) )
+ else if( 2u == tapCount )
{
- SelectEvent( x, y, false );
+ if( mImpl->mEventData->mSelectionEnabled &&
+ mImpl->IsShowingRealText() )
+ {
+ SelectEvent( x, y, false );
+ }
}
}