KEYBOARD_FOCUS_LOST_EVENT,
CURSOR_KEY_EVENT,
TAP_EVENT,
+ PAN_EVENT,
GRAB_HANDLE_EVENT
};
{
INACTIVE,
SELECTING,
- EDITING
+ EDITING,
+ EDITING_WITH_POPUP
};
TextInput( LogicalModelPtr logicalModel,
mPrimaryCursorPosition( 0u ),
mSecondaryCursorPosition( 0u ),
mDecoratorUpdated( false ),
- mCursorBlinkEnabled( true )
+ mCursorBlinkEnabled( true ),
+ mGrabHandleEnabled( true ),
+ mGrabHandlePopupEnabled( true ),
+ mSelectionEnabled( false ),
+ mHorizontalScrollingEnabled( true ),
+ mVerticalScrollingEnabled( false ),
+ mUpdateCursorPosition( false )
{
}
/**
* @brief Helper to move the cursor, grab handle etc.
*/
- bool ProcessInputEvents()
+ bool ProcessInputEvents( const Vector2& controlSize,
+ const Vector2& alignmentOffset )
{
mDecoratorUpdated = false;
}
case TAP_EVENT:
{
- OnTapEvent( *iter );
+ OnTapEvent( *iter, alignmentOffset );
+ break;
+ }
+ case PAN_EVENT:
+ {
+ OnPanEvent( *iter, controlSize, alignmentOffset );
break;
}
case GRAB_HANDLE_EVENT:
}
}
+ // The cursor must also be repositioned after inserts into the model
+ if( mUpdateCursorPosition )
+ {
+ UpdateCursorPosition();
+ mUpdateCursorPosition = false;
+ }
+
mEventQueue.clear();
return mDecoratorUpdated;
}
}
- void HandleBackspaceKey()
- {
- // TODO
- }
-
void HandleCursorKey( int keyCode )
{
// TODO
}
- void HandleKeyString( const char* keyString )
- {
- // TODO
- }
-
- void OnTapEvent( const Event& event )
+ void OnTapEvent( const Event& event,
+ const Vector2& alignmentOffset )
{
unsigned int tapCount = event.p1.mUint;
{
ChangeState( EDITING );
- float xPosition = event.p2.mFloat;
- float yPosition = event.p3.mFloat;
+ float xPosition = event.p2.mFloat - alignmentOffset.x;
+ float yPosition = event.p3.mFloat - alignmentOffset.y;
float height(0.0f);
- GetClosestCursorPosition( xPosition, yPosition, height );
+ GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height );
mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height );
+ mUpdateCursorPosition = false;
mDecoratorUpdated = true;
}
- else if( 2u == tapCount )
+ else if( mSelectionEnabled &&
+ 2u == tapCount )
{
ChangeState( SELECTING );
}
}
+ void OnPanEvent( const Event& event,
+ const Vector2& controlSize,
+ const Vector2& alignmentOffset )
+ {
+ int state = event.p1.mInt;
+
+ if( Gesture::Started == state ||
+ Gesture::Continuing == state )
+ {
+ const Vector2& actualSize = mVisualModel->GetActualSize();
+
+ if( mHorizontalScrollingEnabled )
+ {
+ const float displacementX = event.p2.mFloat;
+ mScrollPosition.x += displacementX;
+
+ // Clamp between -space & 0 (and the text alignment).
+ const float contentWidth = actualSize.width;
+ if( contentWidth > controlSize.width )
+ {
+ const float space = ( contentWidth - controlSize.width ) + alignmentOffset.x;
+ mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x;
+ mScrollPosition.x = ( mScrollPosition.x > -alignmentOffset.x ) ? -alignmentOffset.x : mScrollPosition.x;
+
+ mDecoratorUpdated = true;
+ }
+ else
+ {
+ mScrollPosition.x = 0.f;
+ }
+ }
+
+ if( mVerticalScrollingEnabled )
+ {
+ const float displacementY = event.p3.mFloat;
+ mScrollPosition.y += displacementY;
+
+ // Clamp between -space & 0 (and the text alignment).
+ if( actualSize.height > controlSize.height )
+ {
+ const float space = ( actualSize.height - controlSize.height ) + alignmentOffset.y;
+ mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y;
+ mScrollPosition.y = ( mScrollPosition.y > -alignmentOffset.y ) ? -alignmentOffset.y : mScrollPosition.y;
+
+ mDecoratorUpdated = true;
+ }
+ else
+ {
+ mScrollPosition.y = 0.f;
+ }
+ }
+ }
+ }
+
void OnGrabHandleEvent( const Event& event )
{
unsigned int state = event.p1.mUint;
float yPosition = event.p3.mFloat;
float height(0.0f);
- GetClosestCursorPosition( xPosition, yPosition, height );
+ GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height );
mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height );
- mDecorator->HidePopup();
+ //mDecorator->HidePopup();
+ ChangeState ( EDITING );
mDecoratorUpdated = true;
}
- else if ( GRAB_HANDLE_RELEASED == state )
+ else if ( mGrabHandlePopupEnabled &&
+ GRAB_HANDLE_RELEASED == state )
{
- mDecorator->ShowPopup();
+ //mDecorator->ShowPopup();
+ ChangeState ( EDITING_WITH_POPUP );
+ mDecoratorUpdated = true;
}
-
}
void ChangeState( State newState )
mDecorator->StopCursorBlink();
mDecorator->SetGrabHandleActive( false );
mDecorator->SetSelectionActive( false );
- mDecorator->HidePopup();
+ mDecorator->SetPopupActive( false );
mDecoratorUpdated = true;
}
else if ( SELECTING == mState )
{
mDecorator->StartCursorBlink();
}
- mDecorator->SetGrabHandleActive( true );
+ if( mGrabHandleEnabled )
+ {
+ mDecorator->SetGrabHandleActive( true );
+ }
+ if( mGrabHandlePopupEnabled )
+ {
+ mDecorator->SetPopupActive( false );
+ }
+ mDecorator->SetSelectionActive( false );
+ mDecoratorUpdated = true;
+ }
+ else if( EDITING_WITH_POPUP == mState )
+ {
+ mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
+ if( mCursorBlinkEnabled )
+ {
+ mDecorator->StartCursorBlink();
+ }
+ if( mGrabHandleEnabled )
+ {
+ mDecorator->SetGrabHandleActive( true );
+ }
+ if( mGrabHandlePopupEnabled )
+ {
+ mDecorator->SetPopupActive( true );
+ }
mDecorator->SetSelectionActive( false );
mDecoratorUpdated = true;
}
}
}
- void GetClosestCursorPosition( float& x, float& y, float& height )
+ LineIndex GetClosestLine( float y )
{
- // TODO - Look at LineRuns first
+ LineIndex lineIndex( 0u );
- Text::Length numberOfGlyphs = mVisualModel->GetNumberOfGlyphs();
- if( 0 == numberOfGlyphs )
+ const Vector<LineRun>& lines = mVisualModel->mLines;
+ for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex )
+ {
+ totalHeight += lines[lineIndex].lineSize.height;
+ if( y < totalHeight )
+ {
+ return lineIndex;
+ }
+ }
+
+ return lineIndex-1;
+ }
+
+ void GetClosestCursorPosition( CharacterIndex& logical, float& visualX, float& visualY, float& height )
+ {
+ Length numberOfGlyphs = mVisualModel->mGlyphs.Count();
+ Length numberOfLines = mVisualModel->mLines.Count();
+ if( 0 == numberOfGlyphs ||
+ 0 == numberOfLines )
{
return;
}
- Vector<GlyphInfo>& glyphs = mVisualModel->mGlyphs;
+ // Transform to visual model coords
+ visualX -= mScrollPosition.x;
+ visualY -= mScrollPosition.y;
+
+ // Find which line is closest
+ LineIndex lineIndex( GetClosestLine( visualY ) );
+
+ const Vector<GlyphInfo>& glyphs = mVisualModel->mGlyphs;
const GlyphInfo* const glyphsBuffer = glyphs.Begin();
- Vector<Vector2>& positions = mVisualModel->mGlyphPositions;
+ const Vector<Vector2>& positions = mVisualModel->mGlyphPositions;
const Vector2* const positionsBuffer = positions.Begin();
unsigned int closestGlyph = 0;
+ bool leftOfGlyph( false ); // which side of the glyph?
float closestDistance = MAX_FLOAT;
- for( unsigned int i = 0, numberOfGLyphs = glyphs.Count(); i < numberOfGLyphs; ++i )
+ const LineRun& line = mVisualModel->mLines[lineIndex];
+ GlyphIndex startGlyph = line.glyphIndex;
+ GlyphIndex endGlyph = line.glyphIndex + line.numberOfGlyphs;
+ DALI_ASSERT_DEBUG( endGlyph <= glyphs.Count() && "Invalid line info" );
+
+ for( GlyphIndex i = startGlyph; i < endGlyph; ++i )
{
const GlyphInfo& glyphInfo = *( glyphsBuffer + i );
const Vector2& position = *( positionsBuffer + i );
float glyphX = position.x + glyphInfo.width*0.5f;
float glyphY = position.y + glyphInfo.height*0.5f;
- float distanceToGlyph = fabsf( glyphX - x ) + fabsf( glyphY - y );
+ float distanceToGlyph = fabsf( glyphX - visualX ) + fabsf( glyphY - visualY );
if( distanceToGlyph < closestDistance )
{
closestDistance = distanceToGlyph;
closestGlyph = i;
+ leftOfGlyph = ( visualX < glyphX );
}
}
- // TODO - Consider RTL languages
- x = positions[closestGlyph].x + glyphs[closestGlyph].width;
- y = 0.0f;
+ // Calculate the logical position
+ logical = mVisualModel->GetCharacterIndex( closestGlyph );
- FontMetrics metrics;
- TextAbstraction::FontClient::Get().GetFontMetrics( glyphs[closestGlyph].fontId, metrics );
- height = metrics.height; // TODO - Fix for multi-line
+ // Returns the visual position of the glyph
+ visualX = positions[closestGlyph].x;
+ if( !leftOfGlyph )
+ {
+ visualX += glyphs[closestGlyph].width;
+
+ //if( LTR ) TODO
+ ++logical;
+ }
+ else// if ( RTL ) TODO
+ {
+ //++logical;
+ }
+ visualY = 0.0f;
+
+ height = line.lineSize.height;
+ }
+
+ void UpdateCursorPosition()
+ {
+ if( 0 == mVisualModel->mGlyphs.Count() )
+ {
+ return;
+ }
+
+ // FIXME GetGlyphIndex() is behaving strangely
+#if 0
+ GlyphIndex cursorGlyph = mVisualModel->GetGlyphIndex( mPrimaryCursorPosition );
+#else
+ GlyphIndex cursorGlyph( 0u );
+ for( cursorGlyph = 0; cursorGlyph < mVisualModel->mGlyphs.Count(); ++cursorGlyph )
+ {
+ if( mPrimaryCursorPosition == mVisualModel->GetCharacterIndex( cursorGlyph ) )
+ {
+ break;
+ }
+ }
+#endif
+
+ float visualX( 0.0f );
+ float visualY( 0.0f );
+ float height( 0.0f );
+ const Vector<LineRun>& lineRuns = mVisualModel->mLines;
+
+ if( cursorGlyph > 0 )
+ {
+ --cursorGlyph;
+
+ visualX = mVisualModel->mGlyphPositions[ cursorGlyph ].x;
+ //if( LTR ) TODO
+ visualX += mVisualModel->mGlyphs[ cursorGlyph ].width;
+
+ // Find the line height
+ GlyphIndex lastGlyph( 0 );
+ for( LineIndex lineIndex = 0u; lineIndex < lineRuns.Count(); ++lineIndex )
+ {
+ lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs);
+ if( cursorGlyph < lastGlyph )
+ {
+ height = lineRuns[lineIndex].lineSize.height;
+ break;
+ }
+ }
+ }
+
+ mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, height );
+ mDecoratorUpdated = true;
}
LogicalModelPtr mLogicalModel;
CharacterIndex mPrimaryCursorPosition; ///< Index into logical model for primary cursor
CharacterIndex mSecondaryCursorPosition; ///< Index into logical model for secondary cursor
- bool mDecoratorUpdated : 1; ///< True if the decorator was updated during event processing
- bool mCursorBlinkEnabled : 1; ///< True if cursor should blink when active
+ /**
+ * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control.
+ * Typically this will have a negative value with scrolling occurs.
+ */
+ Vector2 mScrollPosition; ///< The text is offset by this position when scrolling.
+
+ bool mDecoratorUpdated : 1; ///< True if the decorator was updated during event processing
+ bool mCursorBlinkEnabled : 1; ///< True if cursor should blink when active
+ bool mGrabHandleEnabled : 1; ///< True if grab handle is enabled
+ bool mGrabHandlePopupEnabled : 1; ///< True if the grab handle popu-up should be shown
+ bool mSelectionEnabled : 1; ///< True if selection handles, highlight etc. are enabled
+ bool mHorizontalScrollingEnabled : 1; ///< True if horizontal scrolling is enabled
+ bool mVerticalScrollingEnabled : 1; ///< True if vertical scrolling is enabled
+ bool mUpdateCursorPosition : 1; ///< True if the visual position of the cursor must be recalculated
};
struct Controller::FontDefaults
mLayoutEngine(),
mModifyEvents(),
mControlSize(),
+ mAlignmentOffset(),
mOperationsPending( NO_OPERATION ),
mRecalculateNaturalSize( true )
{
LayoutEngine mLayoutEngine; ///< The layout engine.
std::vector<ModifyEvent> mModifyEvents; ///< Temporary stores the text set until the next relayout.
Size mControlSize; ///< The size of the control.
+ Vector2 mAlignmentOffset; ///< Vertical and horizontal offset of the whole text inside the control due to alignment.
OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text.
bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
};
mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID
mImpl->mOperationsPending = ALL_OPERATIONS;
mImpl->mRecalculateNaturalSize = true;
+
+ // Clear the font-specific data
+ mImpl->mLogicalModel->mFontRuns.Clear();
+ mImpl->mVisualModel->mGlyphs.Clear();
+ mImpl->mVisualModel->mGlyphsToCharacters.Clear();
+ mImpl->mVisualModel->mCharactersToGlyph.Clear();
+ mImpl->mVisualModel->mCharactersPerGlyph.Clear();
+ mImpl->mVisualModel->mGlyphsPerCharacter.Clear();
+ mImpl->mVisualModel->mGlyphPositions.Clear();
+ mImpl->mVisualModel->mLines.Clear();
+
+ RequestRelayout();
}
const std::string& Controller::GetDefaultFontFamily() const
mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID
mImpl->mOperationsPending = ALL_OPERATIONS;
mImpl->mRecalculateNaturalSize = true;
+
+ // Clear the font-specific data
+ mImpl->mLogicalModel->mFontRuns.Clear();
+ mImpl->mVisualModel->mGlyphs.Clear();
+ mImpl->mVisualModel->mGlyphsToCharacters.Clear();
+ mImpl->mVisualModel->mCharactersToGlyph.Clear();
+ mImpl->mVisualModel->mCharactersPerGlyph.Clear();
+ mImpl->mVisualModel->mGlyphsPerCharacter.Clear();
+ mImpl->mVisualModel->mGlyphPositions.Clear();
+ mImpl->mVisualModel->mLines.Clear();
+
+ RequestRelayout();
}
const std::string& Controller::GetDefaultFontStyle() const
mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID
mImpl->mOperationsPending = ALL_OPERATIONS;
mImpl->mRecalculateNaturalSize = true;
+
+ // Clear the font-specific data
+ mImpl->mLogicalModel->mFontRuns.Clear();
+ mImpl->mVisualModel->mGlyphs.Clear();
+ mImpl->mVisualModel->mGlyphsToCharacters.Clear();
+ mImpl->mVisualModel->mCharactersToGlyph.Clear();
+ mImpl->mVisualModel->mCharactersPerGlyph.Clear();
+ mImpl->mVisualModel->mGlyphsPerCharacter.Clear();
+ mImpl->mVisualModel->mGlyphPositions.Clear();
+ mImpl->mVisualModel->mLines.Clear();
+
+ RequestRelayout();
}
float Controller::GetDefaultPointSize() const
return false;
}
+const Vector2& Controller::GetScrollPosition() const
+{
+ if( mImpl->mTextInput )
+ {
+ return mImpl->mTextInput->mScrollPosition;
+ }
+
+ return Vector2::ZERO;
+}
+
+const Vector2& Controller::GetAlignmentOffset() const
+{
+ return mImpl->mAlignmentOffset;
+}
+
Vector3 Controller::GetNaturalSize()
{
Vector3 naturalSize;
VALIDATE_FONTS |
GET_LINE_BREAKS |
GET_WORD_BREAKS |
+ BIDI_INFO |
SHAPE_TEXT |
GET_GLYPH_METRICS );
// Make sure the model is up-to-date before layouting
// Operations that need to be done if the size changes.
const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
+ ALIGN |
REORDER );
DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ),
VALIDATE_FONTS |
GET_LINE_BREAKS |
GET_WORD_BREAKS |
+ BIDI_INFO |
SHAPE_TEXT |
GET_GLYPH_METRICS );
// Make sure the model is up-to-date before layouting
// Operations that need to be done if the size changes.
const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
+ ALIGN |
REORDER );
DoRelayout( Size( width, MAX_FLOAT ),
return layoutSize.height;
}
-bool Controller::Relayout( const Vector2& size )
+bool Controller::Relayout( const Size& size )
{
if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) )
{
// Operations that need to be done if the size changes.
mImpl->mOperationsPending = static_cast<OperationsMask>( mImpl->mOperationsPending |
LAYOUT |
+ ALIGN |
UPDATE_ACTUAL_SIZE |
REORDER );
// Do not re-do any operation until something changes.
mImpl->mOperationsPending = NO_OPERATION;
+ // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
+ CalculateTextAlignment( size );
+
if( mImpl->mTextInput )
{
// Move the cursor, grab handle etc.
- updated = mImpl->mTextInput->ProcessInputEvents() || updated;
+ updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize, mImpl->mAlignmentOffset ) || updated;
}
return updated;
void Controller::ReplaceTextEvent( const std::string& text )
{
// Reset buffers.
+ mImpl->mLogicalModel->mText.Clear();
mImpl->mLogicalModel->mScriptRuns.Clear();
mImpl->mLogicalModel->mFontRuns.Clear();
mImpl->mLogicalModel->mLineBreakInfo.Clear();
mImpl->mLogicalModel->mWordBreakInfo.Clear();
mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear();
+ mImpl->mLogicalModel->mCharacterDirections.Clear();
+ mImpl->mLogicalModel->mBidirectionalLineInfo.Clear();
+ mImpl->mLogicalModel->mLogicalToVisualMap.Clear();
+ mImpl->mLogicalModel->mVisualToLogicalMap.Clear();
mImpl->mVisualModel->mGlyphs.Clear();
+ mImpl->mVisualModel->mGlyphsToCharacters.Clear();
+ mImpl->mVisualModel->mCharactersToGlyph.Clear();
+ mImpl->mVisualModel->mCharactersPerGlyph.Clear();
+ mImpl->mVisualModel->mGlyphsPerCharacter.Clear();
+ mImpl->mVisualModel->mGlyphPositions.Clear();
+ mImpl->mVisualModel->mLines.Clear();
// Convert text into UTF-32
Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
// Apply modifications to the model
mImpl->mOperationsPending = ALL_OPERATIONS;
UpdateModel( ALL_OPERATIONS );
- mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ ALIGN |
UPDATE_ACTUAL_SIZE |
REORDER );
}
mImpl->mLogicalModel->mLineBreakInfo.Clear();
mImpl->mLogicalModel->mWordBreakInfo.Clear();
mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear();
+ mImpl->mLogicalModel->mCharacterDirections.Clear();
+ mImpl->mLogicalModel->mBidirectionalLineInfo.Clear();
+ mImpl->mLogicalModel->mLogicalToVisualMap.Clear();
+ mImpl->mLogicalModel->mVisualToLogicalMap.Clear();
mImpl->mVisualModel->mGlyphs.Clear();
+ mImpl->mVisualModel->mGlyphsToCharacters.Clear();
+ mImpl->mVisualModel->mCharactersToGlyph.Clear();
+ mImpl->mVisualModel->mCharactersPerGlyph.Clear();
+ mImpl->mVisualModel->mGlyphsPerCharacter.Clear();
+ mImpl->mVisualModel->mGlyphPositions.Clear();
+ mImpl->mVisualModel->mLines.Clear();
// Convert text into UTF-32
Vector<Character> utf32Characters;
// Apply modifications to the model; TODO - Optimize this
mImpl->mOperationsPending = ALL_OPERATIONS;
UpdateModel( ALL_OPERATIONS );
- mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ ALIGN |
UPDATE_ACTUAL_SIZE |
REORDER );
+
+ // Queue a cursor reposition event; this must wait until after DoRelayout()
+ mImpl->mTextInput->mUpdateCursorPosition = true;
}
void Controller::DeleteTextEvent()
mImpl->mLogicalModel->mLineBreakInfo.Clear();
mImpl->mLogicalModel->mWordBreakInfo.Clear();
mImpl->mLogicalModel->mBidirectionalParagraphInfo.Clear();
+ mImpl->mLogicalModel->mCharacterDirections.Clear();
+ mImpl->mLogicalModel->mBidirectionalLineInfo.Clear();
+ mImpl->mLogicalModel->mLogicalToVisualMap.Clear();
+ mImpl->mLogicalModel->mVisualToLogicalMap.Clear();
mImpl->mVisualModel->mGlyphs.Clear();
+ mImpl->mVisualModel->mGlyphsToCharacters.Clear();
+ mImpl->mVisualModel->mCharactersToGlyph.Clear();
+ mImpl->mVisualModel->mCharactersPerGlyph.Clear();
+ mImpl->mVisualModel->mGlyphsPerCharacter.Clear();
+ mImpl->mVisualModel->mGlyphPositions.Clear();
+ mImpl->mVisualModel->mLines.Clear();
// Delte at current cursor position
Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
// Apply modifications to the model; TODO - Optimize this
mImpl->mOperationsPending = ALL_OPERATIONS;
UpdateModel( ALL_OPERATIONS );
- mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
+ ALIGN |
UPDATE_ACTUAL_SIZE |
REORDER );
+
+ // Queue a cursor reposition event; this must wait until after DoRelayout()
+ mImpl->mTextInput->mUpdateCursorPosition = true;
}
void Controller::UpdateModel( OperationsMask operationsRequired )
}
}
+ Vector<Character> mirroredUtf32Characters;
+ bool textMirrored = false;
if( BIDI_INFO & operations )
{
// Count the number of LINE_NO_BREAK to reserve some space for the vector of paragraph's
scripts,
lineBreakInfo,
bidirectionalInfo );
- }
+
+ if( 0u != bidirectionalInfo.Count() )
+ {
+ // This paragraph has right to left text. Some characters may need to be mirrored.
+ // TODO: consider if the mirrored string can be stored as well.
+
+ textMirrored = GetMirroredText( utf32Characters, mirroredUtf32Characters );
+
+ // Only set the character directions if there is right to left characters.
+ Vector<CharacterDirection>& directions = mImpl->mLogicalModel->mCharacterDirections;
+ directions.Resize( numberOfCharacters );
+
+ GetCharactersDirection( bidirectionalInfo,
+ directions );
+ }
+ else
+ {
+ // There is no right to left characters. Clear the directions vector.
+ mImpl->mLogicalModel->mCharacterDirections.Clear();
+ }
+
+ }
Vector<GlyphInfo>& glyphs = mImpl->mVisualModel->mGlyphs;
Vector<CharacterIndex>& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters;
Vector<Length>& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph;
if( SHAPE_TEXT & operations )
{
+ const Vector<Character>& textToShape = textMirrored ? mirroredUtf32Characters : utf32Characters;
// Shapes the text.
- ShapeText( utf32Characters,
+ ShapeText( textToShape,
lineBreakInfo,
scripts,
validFonts,
}
}
-bool Controller::DoRelayout( const Vector2& size,
+bool Controller::DoRelayout( const Size& size,
OperationsMask operationsRequired,
Size& layoutSize )
{
// after the first time the text has been laid out.
// Fill the vectors again.
- const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters();
Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs();
Vector<LineBreakInfo>& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo;
// Set the layout parameters.
LayoutParameters layoutParameters( size,
+ mImpl->mLogicalModel->mText.Begin(),
lineBreakInfo.Begin(),
wordBreakInfo.Begin(),
numberOfGlyphs,
// some re-allocations.
Vector<LineRun>& lines = mImpl->mVisualModel->mLines;
+ // Delete any previous laid out lines before setting the new ones.
+ lines.Clear();
+
+ // The capacity of the bidirectional paragraph info is the number of paragraphs.
+ lines.Reserve( mImpl->mLogicalModel->mBidirectionalParagraphInfo.Capacity() );
+
// Resize the vector of positions to have the same size than the vector of glyphs.
Vector<Vector2>& glyphPositions = mImpl->mVisualModel->mGlyphPositions;
glyphPositions.Resize( numberOfGlyphs );
- BidirectionalRunIndex firstBidiRunIndex = 0u;
- Length numberOfBidiRuns = 0u;
- mImpl->mLogicalModel->GetNumberOfBidirectionalInfoRuns( 0u, numberOfCharacters, firstBidiRunIndex, numberOfBidiRuns );
-
- // Delete any previous laid out lines before setting the new ones.
- lines.Clear();
- lines.Reserve( numberOfBidiRuns );
-
// Update the visual model.
viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters,
glyphPositions,
free( bidiLineInfo.visualToLogicalMap );
}
}
+ } // REORDER
+
+ if( ALIGN & operations )
+ {
+ mImpl->mLayoutEngine.Align( layoutParameters,
+ layoutSize,
+ lines,
+ glyphPositions );
}
// Sets the actual size.
{
mImpl->mVisualModel->SetActualSize( layoutSize );
}
- }
+ } // view updated
}
else
{
return viewUpdated;
}
+void Controller::CalculateTextAlignment( const Size& size )
+{
+ // TODO : Calculate the vertical offset.
+
+ // Get the direction of the first character.
+ const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u );
+
+ const Size& actualSize = mImpl->mVisualModel->GetActualSize();
+
+ // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END;
+ LayoutEngine::Alignment alignment = mImpl->mLayoutEngine.GetAlignment();
+ if( firstParagraphDirection &&
+ ( LayoutEngine::ALIGN_CENTER != alignment ) )
+ {
+ if( LayoutEngine::ALIGN_BEGIN == alignment )
+ {
+ alignment = LayoutEngine::ALIGN_END;
+ }
+ else
+ {
+ alignment = LayoutEngine::ALIGN_BEGIN;
+ }
+ }
+
+ switch( alignment )
+ {
+ case LayoutEngine::ALIGN_BEGIN:
+ {
+ mImpl->mAlignmentOffset = Vector2::ZERO;
+ break;
+ }
+ case LayoutEngine::ALIGN_CENTER:
+ {
+ mImpl->mAlignmentOffset.y = 0.f;
+ const int intOffset = static_cast<int>( 0.5f * ( size.width - actualSize.width ) ); // try to avoid pixel alignment.
+ mImpl->mAlignmentOffset.x = static_cast<float>( intOffset );
+ break;
+ }
+ case LayoutEngine::ALIGN_END:
+ {
+ mImpl->mAlignmentOffset.y = 0.f;
+ mImpl->mAlignmentOffset.x = size.width - actualSize.width;
+ break;
+ }
+ }
+}
+
View& Controller::GetView()
{
return mImpl->mView;
mImpl->mModifyEvents.push_back( event );
}
+ mImpl->mTextInput->ChangeState( TextInput::EDITING ); // todo Confirm this is the best place to change the state of
+
RequestRelayout();
}
}
}
+void Controller::PanEvent( Gesture::State state, const Vector2& displacement )
+{
+ DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected PanEvent" );
+
+ if( mImpl->mTextInput )
+ {
+ TextInput::Event event( TextInput::PAN_EVENT );
+ event.p1.mInt = state;
+ event.p2.mFloat = displacement.x;
+ event.p3.mFloat = displacement.y;
+ mImpl->mTextInput->mEventQueue.push_back( event );
+
+ RequestRelayout();
+ }
+}
+
void Controller::GrabHandleEvent( GrabHandleState state, float x, float y )
{
DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" );
projects / platform / core / uifw / dali-toolkit.git / blobdiff