if( mEventData->mUpdateCursorPosition )
{
// Updates the cursor position and scrolls the text to make it visible.
-
- UpdateCursorPosition();
+ CursorInfo cursorInfo;
+ GetCursorPosition( mEventData->mPrimaryCursorPosition,
+ cursorInfo );
if( mEventData->mScrollAfterUpdatePosition )
{
- const Vector2& primaryCursorPosition = mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
-
- ScrollToMakePositionVisible( primaryCursorPosition );
+ ScrollToMakePositionVisible( cursorInfo.primaryPosition );
mEventData->mScrollAfterUpdatePosition = false;
}
+ else if( mEventData->mScrollAfterDelete )
+ {
+ ScrollTextToMatchCursor( cursorInfo );
+ mEventData->mScrollAfterDelete = false;
+ }
+
+ UpdateCursorPosition( cursorInfo );
mEventData->mDecoratorUpdated = true;
mEventData->mUpdateCursorPosition = false;
}
- else if( mEventData->mScrollAfterDelete )
- {
- ScrollTextToMatchCursor();
- mEventData->mDecoratorUpdated = true;
- mEventData->mScrollAfterDelete = false;
- }
else
{
bool leftScroll = false;
bool rightScroll = false;
+ CursorInfo leftHandleInfo;
+ CursorInfo rightHandleInfo;
+
if( mEventData->mUpdateLeftSelectionPosition )
{
- UpdateSelectionHandle( LEFT_SELECTION_HANDLE );
+ GetCursorPosition( mEventData->mLeftSelectionPosition,
+ leftHandleInfo );
if( mEventData->mScrollAfterUpdatePosition )
{
- const Vector2& leftHandlePosition = mEventData->mDecorator->GetPosition( LEFT_SELECTION_HANDLE );
-
- ScrollToMakePositionVisible( leftHandlePosition );
+ ScrollToMakePositionVisible( leftHandleInfo.primaryPosition );
leftScroll = true;
}
-
- SetPopupButtons();
- mEventData->mDecoratorUpdated = true;
- mEventData->mUpdateLeftSelectionPosition = false;
}
if( mEventData->mUpdateRightSelectionPosition )
{
- UpdateSelectionHandle( RIGHT_SELECTION_HANDLE );
+ GetCursorPosition( mEventData->mRightSelectionPosition,
+ rightHandleInfo );
if( mEventData->mScrollAfterUpdatePosition )
{
- const Vector2& rightHandlePosition = mEventData->mDecorator->GetPosition( RIGHT_SELECTION_HANDLE );
-
- ScrollToMakePositionVisible( rightHandlePosition );
+ ScrollToMakePositionVisible( rightHandleInfo.primaryPosition );
rightScroll = true;
}
+ }
+
+ if( mEventData->mUpdateLeftSelectionPosition )
+ {
+ UpdateSelectionHandle( LEFT_SELECTION_HANDLE,
+ leftHandleInfo );
SetPopupButtons();
mEventData->mDecoratorUpdated = true;
+ }
+
+ if( mEventData->mUpdateRightSelectionPosition )
+ {
+ UpdateSelectionHandle( RIGHT_SELECTION_HANDLE,
+ rightHandleInfo );
+
+ SetPopupButtons();
+ mEventData->mDecoratorUpdated = true;
+ }
+
+ if( mEventData->mUpdateLeftSelectionPosition || mEventData->mUpdateRightSelectionPosition )
+ {
+ RepositionSelectionHandles();
+
+ mEventData->mUpdateLeftSelectionPosition = false;
mEventData->mUpdateRightSelectionPosition = false;
}
{
mEventData->mLeftSelectionPosition = handleNewPosition;
- RepositionSelectionHandles( mEventData->mLeftSelectionPosition,
- mEventData->mRightSelectionPosition );
-
mEventData->mUpdateLeftSelectionPosition = true;
}
}
{
mEventData->mRightSelectionPosition = handleNewPosition;
- RepositionSelectionHandles( mEventData->mLeftSelectionPosition,
- mEventData->mRightSelectionPosition );
-
mEventData->mUpdateRightSelectionPosition = true;
}
}
if( mEventData->mUpdateLeftSelectionPosition )
{
mEventData->mLeftSelectionPosition = handlePosition;
-
- RepositionSelectionHandles( mEventData->mLeftSelectionPosition,
- mEventData->mRightSelectionPosition );
}
}
}
if( mEventData->mUpdateRightSelectionPosition )
{
mEventData->mRightSelectionPosition = handlePosition;
- RepositionSelectionHandles( mEventData->mLeftSelectionPosition,
- mEventData->mRightSelectionPosition );
}
}
}
if( mEventData->mUpdateLeftSelectionPosition || mEventData->mUpdateRightSelectionPosition )
{
- RepositionSelectionHandles( mEventData->mLeftSelectionPosition,
- mEventData->mRightSelectionPosition );
+ RepositionSelectionHandles();
mEventData->mScrollAfterUpdatePosition = true;
}
const float xPosition = event.p2.mFloat - mEventData->mScrollPosition.x - mAlignmentOffset.x;
const float yPosition = event.p3.mFloat - mEventData->mScrollPosition.y - mAlignmentOffset.y;
- const CharacterIndex leftPosition = mEventData->mLeftSelectionPosition;
- const CharacterIndex rightPosition = mEventData->mRightSelectionPosition;
-
+ // Calculates the logical position from the x,y coords.
RepositionSelectionHandles( xPosition,
yPosition );
- mEventData->mUpdateLeftSelectionPosition = leftPosition != mEventData->mLeftSelectionPosition;
- mEventData->mUpdateRightSelectionPosition = rightPosition != mEventData->mRightSelectionPosition;
+ mEventData->mUpdateLeftSelectionPosition = true;
+ mEventData->mUpdateRightSelectionPosition = true;
- mEventData->mScrollAfterUpdatePosition = ( ( mEventData->mUpdateLeftSelectionPosition || mEventData->mUpdateRightSelectionPosition ) &&
- ( mEventData->mLeftSelectionPosition != mEventData->mRightSelectionPosition ) );
+ mEventData->mScrollAfterUpdatePosition = ( mEventData->mLeftSelectionPosition != mEventData->mRightSelectionPosition );
}
}
if( mEventData->mSelectionEnabled )
{
- RepositionSelectionHandles( 0u,
- mLogicalModel->mText.Count() );
+ mEventData->mLeftSelectionPosition = 0u;
+ mEventData->mRightSelectionPosition = mLogicalModel->mText.Count();
mEventData->mScrollAfterUpdatePosition = true;
mEventData->mUpdateLeftSelectionPosition = true;
// Scroll after delete.
mEventData->mPrimaryCursorPosition = handlesCrossed ? mEventData->mRightSelectionPosition : mEventData->mLeftSelectionPosition;
mEventData->mScrollAfterDelete = true;
- mEventData->mDecoratorUpdated = true;
}
+ // Udpade the cursor position and the decorator.
+ // Scroll after the position is updated if is not scrolling after delete.
+ mEventData->mUpdateCursorPosition = true;
+ mEventData->mScrollAfterUpdatePosition = !mEventData->mScrollAfterDelete;
+ mEventData->mDecoratorUpdated = true;
}
}
}
}
-void Controller::Impl::RepositionSelectionHandles( CharacterIndex selectionStart, CharacterIndex selectionEnd )
+void Controller::Impl::RepositionSelectionHandles()
{
+ CharacterIndex selectionStart = mEventData->mLeftSelectionPosition;
+ CharacterIndex selectionEnd = mEventData->mRightSelectionPosition;
+
if( selectionStart == selectionEnd )
{
// Nothing to select if handles are in the same place.
mEventData->mDecorator->ClearHighlights();
- mEventData->mLeftSelectionPosition = selectionStart;
- mEventData->mRightSelectionPosition = selectionEnd;
-
const GlyphIndex* const charactersToGlyphBuffer = mVisualModel->mCharactersToGlyph.Begin();
const Length* const glyphsPerCharacterBuffer = mVisualModel->mGlyphsPerCharacter.Begin();
const GlyphInfo* const glyphsBuffer = mVisualModel->mGlyphs.Begin();
return;
}
- RepositionSelectionHandles( selectionStart, selectionEnd );
+ mEventData->mLeftSelectionPosition = selectionStart;
+ mEventData->mRightSelectionPosition = selectionEnd;
}
void Controller::Impl::SetPopupButtons()
{
// TODO: Check for multiline with \n, etc...
- // Check if the logical position is the first or the last one of the text.
- const bool isFirstPosition = 0u == logical;
- const bool isLastPosition = mLogicalModel->mText.Count() == logical;
-
- if( isFirstPosition && isLastPosition )
+ const Length numberOfCharacters = mLogicalModel->mText.Count();
+ if( !IsShowingRealText() )
{
- // There is zero characters. Get the default font's line height.
+ // Do not want to use the place-holder text to set the cursor position.
+
+ // Use the line's height of the font's family set to set the cursor's size.
+ // If there is no font's family set, use the default font.
+ // Use the current alignment to place the cursor at the beginning, center or end of the box.
+
cursorInfo.lineHeight = GetDefaultFontLineHeight();
cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
- cursorInfo.primaryPosition.x = 0.f;
- cursorInfo.primaryPosition.y = 0.f;
+ switch( mLayoutEngine.GetHorizontalAlignment() )
+ {
+ case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
+ {
+ cursorInfo.primaryPosition.x = 0.f;
+ break;
+ }
+ case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
+ {
+ cursorInfo.primaryPosition.x = floorf( 0.5f * mVisualModel->mControlSize.width );
+ break;
+ }
+ case LayoutEngine::HORIZONTAL_ALIGN_END:
+ {
+ cursorInfo.primaryPosition.x = mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
+ break;
+ }
+ }
+
+ switch( mLayoutEngine.GetVerticalAlignment() )
+ {
+ case LayoutEngine::VERTICAL_ALIGN_TOP:
+ {
+ cursorInfo.primaryPosition.y = 0.f;
+ break;
+ }
+ case LayoutEngine::VERTICAL_ALIGN_CENTER:
+ {
+ cursorInfo.primaryPosition.y = floorf( 0.5f * ( mVisualModel->mControlSize.height - cursorInfo.lineHeight ) );
+ break;
+ }
+ case LayoutEngine::VERTICAL_ALIGN_BOTTOM:
+ {
+ cursorInfo.primaryPosition.y = mVisualModel->mControlSize.height - cursorInfo.lineHeight;
+ break;
+ }
+ }
// Nothing else to do.
return;
}
+ // Check if the logical position is the first or the last one of the text.
+ const bool isFirstPosition = 0u == logical;
+ const bool isLastPosition = numberOfCharacters == logical;
+
// 'logical' is the logical 'cursor' index.
// Get the next and current logical 'character' index.
const CharacterIndex nextCharacterIndex = logical;
return cursorIndex;
}
-void Controller::Impl::UpdateCursorPosition()
+void Controller::Impl::UpdateCursorPosition( const CursorInfo& cursorInfo )
{
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::UpdateCursorPosition %p\n", this );
if( NULL == mEventData )
return;
}
- if( IsShowingPlaceholderText() || ( 0u == mLogicalModel->mText.Count() ) )
- {
- // Do not want to use the place-holder text to set the cursor position.
-
- // Use the line's height of the font's family set to set the cursor's size.
- // If there is no font's family set, use the default font.
- // Use the current alignment to place the cursor at the beginning, center or end of the box.
-
- float lineHeight = 0.f;
-
- FontId defaultFontId = 0u;
- if( NULL == mFontDefaults )
- {
- TextAbstraction::FontDescription fontDescription;
- defaultFontId = mFontClient.GetFontId( fontDescription );
- }
- else
- {
- defaultFontId = mFontDefaults->GetFontId( mFontClient );
- }
-
- Text::FontMetrics fontMetrics;
- mMetrics->GetFontMetrics( defaultFontId, fontMetrics );
-
- lineHeight = fontMetrics.ascender - fontMetrics.descender;
-
-
- Vector2 cursorPosition;
+ const Vector2 offset = mEventData->mScrollPosition + ( IsShowingRealText() ? mAlignmentOffset : Vector2::ZERO );
+ const Vector2 cursorPosition = cursorInfo.primaryPosition + offset;
- switch( mLayoutEngine.GetHorizontalAlignment() )
- {
- case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
- {
- cursorPosition.x = 0.f;
- break;
- }
- case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
- {
- cursorPosition.x = floor( 0.5f * mVisualModel->mControlSize.width );
- break;
- }
- case LayoutEngine::HORIZONTAL_ALIGN_END:
- {
- cursorPosition.x = mVisualModel->mControlSize.width - mEventData->mDecorator->GetCursorWidth();
- break;
- }
- }
+ // Sets the cursor position.
+ mEventData->mDecorator->SetPosition( PRIMARY_CURSOR,
+ cursorPosition.x,
+ cursorPosition.y,
+ cursorInfo.primaryCursorHeight,
+ cursorInfo.lineHeight );
+ DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Primary cursor position: %f,%f\n", cursorPosition.x, cursorPosition.y );
- switch( mLayoutEngine.GetVerticalAlignment() )
- {
- case LayoutEngine::VERTICAL_ALIGN_TOP:
- {
- cursorPosition.y = 0.f;
- break;
- }
- case LayoutEngine::VERTICAL_ALIGN_CENTER:
- {
- cursorPosition.y = floorf( 0.5f * ( mVisualModel->mControlSize.height - lineHeight ) );
- break;
- }
- case LayoutEngine::VERTICAL_ALIGN_BOTTOM:
- {
- cursorPosition.y = mVisualModel->mControlSize.height - lineHeight;
- break;
- }
- }
+ // Sets the grab handle position.
+ mEventData->mDecorator->SetPosition( GRAB_HANDLE,
+ cursorPosition.x,
+ cursorPosition.y,
+ cursorInfo.lineHeight );
- mEventData->mDecorator->SetPosition( PRIMARY_CURSOR,
- cursorPosition.x,
- cursorPosition.y,
- lineHeight,
- lineHeight );
- }
- else
+ if( cursorInfo.isSecondaryCursor )
{
- CursorInfo cursorInfo;
- GetCursorPosition( mEventData->mPrimaryCursorPosition,
- cursorInfo );
-
- const Vector2 offset = mEventData->mScrollPosition + mAlignmentOffset;
- const Vector2 cursorPosition = cursorInfo.primaryPosition + offset;
-
- // Sets the cursor position.
- mEventData->mDecorator->SetPosition( PRIMARY_CURSOR,
- cursorPosition.x,
- cursorPosition.y,
- cursorInfo.primaryCursorHeight,
- cursorInfo.lineHeight );
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Primary cursor position: %f,%f\n", cursorPosition.x, cursorPosition.y );
-
- // Sets the grab handle position.
- mEventData->mDecorator->SetPosition( GRAB_HANDLE,
- cursorPosition.x,
- cursorPosition.y,
+ mEventData->mDecorator->SetPosition( SECONDARY_CURSOR,
+ cursorInfo.secondaryPosition.x + offset.x,
+ cursorInfo.secondaryPosition.y + offset.y,
+ cursorInfo.secondaryCursorHeight,
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::EDITING_WITH_GRAB_HANDLE == mEventData->mState ) ||
+ ( EventData::GRAB_HANDLE_PANNING == mEventData->mState ) )
+ {
if( cursorInfo.isSecondaryCursor )
{
mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_BOTH );
- mEventData->mDecorator->SetPosition( SECONDARY_CURSOR,
- cursorInfo.secondaryPosition.x + offset.x,
- cursorInfo.secondaryPosition.y + offset.y,
- cursorInfo.secondaryCursorHeight,
- cursorInfo.lineHeight );
- DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Secondary cursor position: %f,%f\n", cursorInfo.secondaryPosition.x + offset.x, cursorInfo.secondaryPosition.y + offset.y );
}
else
{
mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
}
}
+ else
+ {
+ mEventData->mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
+ }
+
DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::UpdateCursorPosition\n" );
}
-void Controller::Impl::UpdateSelectionHandle( HandleType handleType )
+void Controller::Impl::UpdateSelectionHandle( HandleType handleType,
+ const CursorInfo& cursorInfo )
{
if( ( LEFT_SELECTION_HANDLE != handleType ) &&
( RIGHT_SELECTION_HANDLE != handleType ) )
return;
}
- const bool leftSelectionHandle = LEFT_SELECTION_HANDLE == handleType;
- const CharacterIndex index = leftSelectionHandle ? mEventData->mLeftSelectionPosition : mEventData->mRightSelectionPosition;
-
- CursorInfo cursorInfo;
- GetCursorPosition( index,
- cursorInfo );
-
- const Vector2 offset = mEventData->mScrollPosition + mAlignmentOffset;
- const Vector2 cursorPosition = cursorInfo.primaryPosition + offset;
+ const Vector2 cursorPosition = cursorInfo.primaryPosition + mEventData->mScrollPosition + mAlignmentOffset;
// Sets the grab handle position.
mEventData->mDecorator->SetPosition( handleType,
void Controller::Impl::ClampHorizontalScroll( const Vector2& actualSize )
{
// Clamp between -space & 0 (and the text alignment).
+
if( actualSize.width > mVisualModel->mControlSize.width )
{
const float space = ( actualSize.width - mVisualModel->mControlSize.width ) + mAlignmentOffset.x;
void Controller::Impl::ScrollToMakePositionVisible( const Vector2& position )
{
- Vector2 offset;
- bool updateDecorator = false;
- if( position.x < 0.f )
- {
- offset.x = -position.x;
- mEventData->mScrollPosition.x += offset.x;
- updateDecorator = true;
- }
- else if( position.x > mVisualModel->mControlSize.width )
+ // position is in actor's coords.
+ const float positionEnd = position.x + ( mEventData->mDecorator ? mEventData->mDecorator->GetCursorWidth() : 0.f );
+
+ // Transform the position to decorator coords.
+ const float offset = mEventData->mScrollPosition.x + mAlignmentOffset.x;
+ const float decoratorPositionBegin = position.x + offset;
+ const float decoratorPositionEnd = positionEnd + offset;
+
+ if( decoratorPositionBegin < 0.f )
{
- offset.x = mVisualModel->mControlSize.width - position.x;
- mEventData->mScrollPosition.x += offset.x;
- updateDecorator = true;
+ mEventData->mScrollPosition.x = -position.x - mAlignmentOffset.x;
}
-
- if( updateDecorator && mEventData->mDecorator )
+ else if( decoratorPositionEnd > mVisualModel->mControlSize.width )
{
- mEventData->mDecorator->UpdatePositions( offset );
+ mEventData->mScrollPosition.x = mVisualModel->mControlSize.width - positionEnd - mAlignmentOffset.x;
}
-
- // TODO : calculate the vertical scroll.
}
-void Controller::Impl::ScrollTextToMatchCursor()
+void Controller::Impl::ScrollTextToMatchCursor( const CursorInfo& cursorInfo )
{
// Get the current cursor position in decorator coords.
const Vector2& currentCursorPosition = mEventData->mDecorator->GetPosition( PRIMARY_CURSOR );
- // Calculate the new cursor position.
- CursorInfo cursorInfo;
- GetCursorPosition( mEventData->mPrimaryCursorPosition,
- cursorInfo );
-
// Calculate the offset to match the cursor position before the character was deleted.
mEventData->mScrollPosition.x = currentCursorPosition.x - cursorInfo.primaryPosition.x - mAlignmentOffset.x;
ClampHorizontalScroll( mVisualModel->GetActualSize() );
-
- const Vector2 offset = mEventData->mScrollPosition + mAlignmentOffset;
- const Vector2 cursorPosition = cursorInfo.primaryPosition + offset;
-
- // Sets the cursor position.
- mEventData->mDecorator->SetPosition( PRIMARY_CURSOR,
- cursorPosition.x,
- cursorPosition.y,
- cursorInfo.primaryCursorHeight,
- cursorInfo.lineHeight );
-
- // Sets the grab handle position.
- mEventData->mDecorator->SetPosition( GRAB_HANDLE,
- cursorPosition.x,
- cursorPosition.y,
- cursorInfo.lineHeight );
-
- if( cursorInfo.isSecondaryCursor )
- {
- mEventData->mDecorator->SetPosition( SECONDARY_CURSOR,
- cursorInfo.secondaryPosition.x + offset.x,
- cursorInfo.secondaryPosition.y + offset.y,
- cursorInfo.secondaryCursorHeight,
- 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::EDITING_WITH_GRAB_HANDLE == 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_NONE );
- }
}
void Controller::Impl::RequestRelayout()
projects / platform / core / uifw / dali-toolkit.git / commitdiff