// EXTERNAL INCLUDES
#include <limits>
-#include <vector>
#include <dali/public-api/adaptor-framework/key.h>
-#include <dali/public-api/text-abstraction/font-client.h>
// INTERNAL INCLUDES
#include <dali-toolkit/internal/text/bidirectional-support.h>
#include <dali-toolkit/internal/text/character-set-conversion.h>
-#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/logical-model-impl.h>
#include <dali-toolkit/internal/text/multi-language-support.h>
#include <dali-toolkit/internal/text/script-run.h>
#include <dali-toolkit/internal/text/segmentation.h>
#include <dali-toolkit/internal/text/shaper.h>
+#include <dali-toolkit/internal/text/text-controller-impl.h>
#include <dali-toolkit/internal/text/text-io.h>
#include <dali-toolkit/internal/text/text-view.h>
-#include <dali-toolkit/internal/text/visual-model-impl.h>
-
-using std::vector;
namespace
{
const float MAX_FLOAT = std::numeric_limits<float>::max();
-const std::string EMPTY_STRING;
-
-enum ModifyType
-{
- REPLACE_TEXT, ///< Replace the entire text
- INSERT_TEXT, ///< Insert characters at the current cursor position
- DELETE_TEXT ///< Delete a character at the current cursor position
-};
-struct ModifyEvent
-{
- ModifyType type;
- std::string text;
-};
+const std::string EMPTY_STRING("");
} // namespace
namespace Text
{
-struct Controller::TextInput
-{
- // Used to queue input events until DoRelayout()
- enum EventType
- {
- KEYBOARD_FOCUS_GAIN_EVENT,
- KEYBOARD_FOCUS_LOST_EVENT,
- CURSOR_KEY_EVENT,
- TAP_EVENT,
- PAN_EVENT,
- GRAB_HANDLE_EVENT
- };
-
- union Param
- {
- int mInt;
- unsigned int mUint;
- float mFloat;
- };
-
- struct Event
- {
- Event( EventType eventType )
- : type( eventType )
- {
- p1.mInt = 0;
- p2.mInt = 0;
- }
-
- EventType type;
- Param p1;
- Param p2;
- Param p3;
- };
-
- enum State
- {
- INACTIVE,
- SELECTING,
- EDITING
- };
-
- TextInput( LogicalModelPtr logicalModel,
- VisualModelPtr visualModel,
- DecoratorPtr decorator )
- : mLogicalModel( logicalModel ),
- mVisualModel( visualModel ),
- mDecorator( decorator ),
- mState( INACTIVE ),
- mPrimaryCursorPosition( 0u ),
- mSecondaryCursorPosition( 0u ),
- mDecoratorUpdated( false ),
- mCursorBlinkEnabled( true ),
- mGrabHandleEnabled( false ),
- mGrabHandlePopupEnabled( false ),
- mSelectionEnabled( false ),
- mHorizontalScrollingEnabled( true ),
- mVerticalScrollingEnabled( false ),
- mUpdateCursorPosition( false )
- {
- }
-
- /**
- * @brief Helper to move the cursor, grab handle etc.
- */
- bool ProcessInputEvents( const Vector2& controlSize )
- {
- mDecoratorUpdated = false;
-
- if( mDecorator )
- {
- for( vector<TextInput::Event>::iterator iter = mEventQueue.begin(); iter != mEventQueue.end(); ++iter )
- {
- switch( iter->type )
- {
- case KEYBOARD_FOCUS_GAIN_EVENT:
- {
- OnKeyboardFocus( true );
- break;
- }
- case KEYBOARD_FOCUS_LOST_EVENT:
- {
- OnKeyboardFocus( false );
- break;
- }
- case CURSOR_KEY_EVENT:
- {
- OnCursorKeyEvent( *iter );
- break;
- }
- case TAP_EVENT:
- {
- OnTapEvent( *iter );
- break;
- }
- case PAN_EVENT:
- {
- OnPanEvent( *iter, controlSize );
- break;
- }
- case GRAB_HANDLE_EVENT:
- {
- OnGrabHandleEvent( *iter );
- break;
- }
- }
- }
- }
-
- // The cursor must also be repositioned after inserts into the model
- if( mUpdateCursorPosition )
- {
- UpdateCursorPosition();
- mUpdateCursorPosition = false;
- }
-
- mEventQueue.clear();
-
- return mDecoratorUpdated;
- }
-
- void OnKeyboardFocus( bool hasFocus )
- {
- if( !hasFocus )
- {
- ChangeState( INACTIVE );
- }
- else
- {
- ChangeState( EDITING );
- }
- }
-
- void OnCursorKeyEvent( const Event& event )
- {
- int keyCode = event.p1.mInt;
-
- if( Dali::DALI_KEY_CURSOR_LEFT == keyCode )
- {
- // TODO
- }
- else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode )
- {
- // TODO
- }
- else if( Dali::DALI_KEY_CURSOR_UP == keyCode )
- {
- // TODO
- }
- else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode )
- {
- // TODO
- }
- }
-
- void HandleCursorKey( int keyCode )
- {
- // TODO
- }
-
- void OnTapEvent( const Event& event )
- {
- unsigned int tapCount = event.p1.mUint;
-
- if( 1u == tapCount )
- {
- ChangeState( EDITING );
-
- float xPosition = event.p2.mFloat;
- float yPosition = event.p3.mFloat;
- float height(0.0f);
- GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height );
- mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height );
- mUpdateCursorPosition = false;
-
- mDecoratorUpdated = true;
- }
- else if( mSelectionEnabled &&
- 2u == tapCount )
- {
- ChangeState( SELECTING );
- }
- }
-
- void OnPanEvent( const Event& event, const Vector2& controlSize )
- {
- int state = event.p1.mInt;
-
- if( Gesture::Started == state ||
- Gesture::Continuing == state )
- {
- const Vector2& actualSize = mVisualModel->GetActualSize();
-
- if( mHorizontalScrollingEnabled )
- {
- float displacementX = event.p2.mFloat;
- mScrollPosition.x += displacementX;
-
- // Clamp between -space & 0
- float contentWidth = actualSize.width;
- float space = (contentWidth > controlSize.width) ? contentWidth - controlSize.width : 0.0f;
- mScrollPosition.x = ( mScrollPosition.x < -space ) ? -space : mScrollPosition.x;
- mScrollPosition.x = ( mScrollPosition.x > 0 ) ? 0 : mScrollPosition.x;
-
- mDecoratorUpdated = true;
- }
- if( mVerticalScrollingEnabled )
- {
- float displacementY = event.p3.mFloat;
- mScrollPosition.y += displacementY;
-
- // Clamp between -space & 0
- float space = (actualSize.height > controlSize.height) ? actualSize.height - controlSize.height : 0.0f;
- mScrollPosition.y = ( mScrollPosition.y < -space ) ? -space : mScrollPosition.y;
- mScrollPosition.y = ( mScrollPosition.y > 0 ) ? 0 : mScrollPosition.y;
-
- mDecoratorUpdated = true;
- }
- }
- }
-
- void OnGrabHandleEvent( const Event& event )
- {
- unsigned int state = event.p1.mUint;
-
- if( GRAB_HANDLE_PRESSED == state )
- {
- float xPosition = event.p2.mFloat;
- float yPosition = event.p3.mFloat;
- float height(0.0f);
-
- GetClosestCursorPosition( mPrimaryCursorPosition, xPosition, yPosition, height );
-
- mDecorator->SetPosition( PRIMARY_CURSOR, xPosition, yPosition, height );
- mDecorator->HidePopup();
- mDecoratorUpdated = true;
- }
- else if ( mGrabHandlePopupEnabled &&
- GRAB_HANDLE_RELEASED == state )
- {
- mDecorator->ShowPopup();
- }
- }
-
- void ChangeState( State newState )
- {
- if( mState != newState )
- {
- mState = newState;
-
- if( INACTIVE == mState )
- {
- mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
- mDecorator->StopCursorBlink();
- mDecorator->SetGrabHandleActive( false );
- mDecorator->SetSelectionActive( false );
- mDecorator->HidePopup();
- mDecoratorUpdated = true;
- }
- else if ( SELECTING == mState )
- {
- mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
- mDecorator->StopCursorBlink();
- mDecorator->SetGrabHandleActive( false );
- mDecorator->SetSelectionActive( true );
- mDecoratorUpdated = true;
- }
- else if( EDITING == mState )
- {
- mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
- if( mCursorBlinkEnabled )
- {
- mDecorator->StartCursorBlink();
- }
- if( mGrabHandleEnabled )
- {
- mDecorator->SetGrabHandleActive( true );
- }
- mDecorator->SetSelectionActive( false );
- mDecoratorUpdated = true;
- }
- }
- }
-
- LineIndex GetClosestLine( float y )
- {
- LineIndex lineIndex( 0u );
-
- const Vector<LineRun>& lines = mVisualModel->mLines;
- for( float totalHeight = 0; lineIndex < lines.Count(); ++lineIndex )
- {
- totalHeight += lines[lineIndex].lineSize.height;
- if( y < totalHeight )
- {
- break;
- }
- }
-
- return lineIndex;
- }
-
- 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;
- }
-
- // 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();
-
- 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;
-
- 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 - visualX ) + fabsf( glyphY - visualY );
-
- if( distanceToGlyph < closestDistance )
- {
- closestDistance = distanceToGlyph;
- closestGlyph = i;
- leftOfGlyph = ( visualX < glyphX );
- }
- }
-
- // Calculate the logical position
- logical = mVisualModel->GetCharacterIndex( closestGlyph );
-
- // 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 );
- LineIndex lineIndex( 0u );
- 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
- for( GlyphIndex lastGlyph = 0; lineIndex < lineRuns.Count(); ++lineIndex )
- {
- lastGlyph = (lineRuns[lineIndex].glyphIndex + lineRuns[lineIndex].numberOfGlyphs);
- if( cursorGlyph < lastGlyph )
- {
- break;
- }
- }
- }
-
- mDecorator->SetPosition( PRIMARY_CURSOR, visualX, visualY, lineRuns[lineIndex].lineSize.height );
- mDecoratorUpdated = true;
- }
-
- LogicalModelPtr mLogicalModel;
- VisualModelPtr mVisualModel;
- DecoratorPtr mDecorator;
-
- std::string mPlaceholderText;
-
- /**
- * This is used to delay handling events until after the model has been updated.
- * The number of updates to the model is minimized to improve performance.
- */
- vector<Event> mEventQueue; ///< The queue of touch events etc.
-
- State mState; ///< Selection mode, edit mode etc.
-
- CharacterIndex mPrimaryCursorPosition; ///< Index into logical model for primary cursor
- CharacterIndex mSecondaryCursorPosition; ///< Index into logical model for secondary cursor
-
- /**
- * 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
-{
- FontDefaults()
- : mDefaultPointSize(0.0f),
- mFontId(0u)
- {
- }
-
- FontId GetFontId( TextAbstraction::FontClient& fontClient )
- {
- if( !mFontId )
- {
- Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64;
- mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize );
- }
-
- return mFontId;
- }
-
- std::string mDefaultFontFamily;
- std::string mDefaultFontStyle;
- float mDefaultPointSize;
- FontId mFontId;
-};
-
-struct Controller::Impl
-{
- Impl( ControlInterface& controlInterface )
- : mControlInterface( controlInterface ),
- mLogicalModel(),
- mVisualModel(),
- mFontDefaults( NULL ),
- mTextInput( NULL ),
- mFontClient(),
- mView(),
- mLayoutEngine(),
- mModifyEvents(),
- mControlSize(),
- mOperationsPending( NO_OPERATION ),
- mRecalculateNaturalSize( true )
- {
- mLogicalModel = LogicalModel::New();
- mVisualModel = VisualModel::New();
-
- mFontClient = TextAbstraction::FontClient::Get();
-
- mView.SetVisualModel( mVisualModel );
- }
-
- ~Impl()
- {
- delete mTextInput;
- }
-
- ControlInterface& mControlInterface; ///< Reference to the text controller.
- LogicalModelPtr mLogicalModel; ///< Pointer to the logical model.
- VisualModelPtr mVisualModel; ///< Pointer to the visual model.
- FontDefaults* mFontDefaults; ///< Avoid allocating this when the user does not specify a font.
- Controller::TextInput* mTextInput; ///< Avoid allocating everything for text input until EnableTextInput().
- TextAbstraction::FontClient mFontClient; ///< Handle to the font client.
- View mView; ///< The view interface to the rendering back-end.
- 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.
- OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text.
- bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated.
-};
-
ControllerPtr Controller::New( ControlInterface& controlInterface )
{
return ControllerPtr( new Controller( controlInterface ) );
// Keep until size negotiation
ModifyEvent event;
- event.type = REPLACE_TEXT;
+ event.type = ModifyEvent::REPLACE_TEXT;
event.text = text;
mImpl->mModifyEvents.push_back( event );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
// Cancel previously queued events
- mImpl->mTextInput->mEventQueue.clear();
+ mImpl->mEventData->mEventQueue.clear();
// TODO - Hide selection decorations
}
void Controller::GetText( std::string& text ) const
{
if( !mImpl->mModifyEvents.empty() &&
- REPLACE_TEXT == mImpl->mModifyEvents[0].type )
+ ModifyEvent::REPLACE_TEXT == mImpl->mModifyEvents[0].type )
{
text = mImpl->mModifyEvents[0].text;
}
void Controller::SetPlaceholderText( const std::string& text )
{
- if( !mImpl->mTextInput )
+ if( !mImpl->mEventData )
{
- mImpl->mTextInput->mPlaceholderText = text;
+ mImpl->mEventData->mPlaceholderText = text;
}
}
void Controller::GetPlaceholderText( std::string& text ) const
{
- if( !mImpl->mTextInput )
+ if( !mImpl->mEventData )
{
- text = mImpl->mTextInput->mPlaceholderText;
+ text = mImpl->mEventData->mPlaceholderText;
}
}
{
if( !mImpl->mFontDefaults )
{
- mImpl->mFontDefaults = new Controller::FontDefaults();
+ mImpl->mFontDefaults = new FontDefaults();
}
mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily;
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();
+ mImpl->mVisualModel->ClearCaches();
+
+ mImpl->RequestRelayout();
}
const std::string& Controller::GetDefaultFontFamily() const
{
if( !mImpl->mFontDefaults )
{
- mImpl->mFontDefaults = new Controller::FontDefaults();
+ mImpl->mFontDefaults = new FontDefaults();
}
mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle;
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();
+ mImpl->mVisualModel->ClearCaches();
+
+ mImpl->RequestRelayout();
}
const std::string& Controller::GetDefaultFontStyle() const
{
if( !mImpl->mFontDefaults )
{
- mImpl->mFontDefaults = new Controller::FontDefaults();
+ mImpl->mFontDefaults = new FontDefaults();
}
mImpl->mFontDefaults->mDefaultPointSize = pointSize;
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();
+ mImpl->mVisualModel->ClearCaches();
+
+ mImpl->RequestRelayout();
}
float Controller::GetDefaultPointSize() const
return 0.0f;
}
-void Controller::GetDefaultFonts( Vector<FontRun>& fonts, Length numberOfCharacters )
+void Controller::GetDefaultFonts( Vector<FontRun>& fonts, Length numberOfCharacters ) const
{
if( mImpl->mFontDefaults )
{
}
}
+void Controller::SetTextColor( const Vector4& textColor )
+{
+ mImpl->mVisualModel->SetTextColor( textColor );
+}
+
+const Vector4& Controller::GetTextColor() const
+{
+ return mImpl->mVisualModel->GetTextColor();
+}
+
+void Controller::SetShadowOffset( const Vector2& shadowOffset )
+{
+ mImpl->mVisualModel->SetShadowOffset( shadowOffset );
+}
+
+const Vector2& Controller::GetShadowOffset() const
+{
+ return mImpl->mVisualModel->GetShadowOffset();
+}
+
+void Controller::SetShadowColor( const Vector4& shadowColor )
+{
+ mImpl->mVisualModel->SetShadowColor( shadowColor );
+}
+
+const Vector4& Controller::GetShadowColor() const
+{
+ return mImpl->mVisualModel->GetShadowColor();
+}
+
+void Controller::SetUnderlineColor( const Vector4& color )
+{
+ mImpl->mVisualModel->SetUnderlineColor( color );
+}
+
+const Vector4& Controller::GetUnderlineColor() const
+{
+ return mImpl->mVisualModel->GetUnderlineColor();
+}
+
+void Controller::SetUnderlineEnabled( bool enabled )
+{
+ mImpl->mVisualModel->SetUnderlineEnabled( enabled );
+}
+
+bool Controller::IsUnderlineEnabled() const
+{
+ return mImpl->mVisualModel->IsUnderlineEnabled();
+}
+
+void Controller::SetUnderlineHeight( float height )
+{
+ mImpl->mVisualModel->SetUnderlineHeight( height );
+}
+
+float Controller::GetUnderlineHeight() const
+{
+ return mImpl->mVisualModel->GetUnderlineHeight();
+}
+
void Controller::EnableTextInput( DecoratorPtr decorator )
{
- if( !mImpl->mTextInput )
+ if( !mImpl->mEventData )
{
- mImpl->mTextInput = new TextInput( mImpl->mLogicalModel, mImpl->mVisualModel, decorator );
+ mImpl->mEventData = new EventData( decorator );
}
}
void Controller::SetEnableCursorBlink( bool enable )
{
- DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "TextInput disabled" );
+ DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- mImpl->mTextInput->mCursorBlinkEnabled = enable;
+ mImpl->mEventData->mCursorBlinkEnabled = enable;
if( !enable &&
- mImpl->mTextInput->mDecorator )
+ mImpl->mEventData->mDecorator )
{
- mImpl->mTextInput->mDecorator->StopCursorBlink();
+ mImpl->mEventData->mDecorator->StopCursorBlink();
}
}
}
bool Controller::GetEnableCursorBlink() const
{
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- return mImpl->mTextInput->mCursorBlinkEnabled;
+ return mImpl->mEventData->mCursorBlinkEnabled;
}
return false;
const Vector2& Controller::GetScrollPosition() const
{
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- return mImpl->mTextInput->mScrollPosition;
+ return mImpl->mEventData->mScrollPosition;
}
return Vector2::ZERO;
}
+const Vector2& Controller::GetAlignmentOffset() const
+{
+ return mImpl->mAlignmentOffset;
+}
+
Vector3 Controller::GetNaturalSize()
{
Vector3 naturalSize;
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 ) )
{
mImpl->mVisualModel->SetGlyphPositions( NULL, 0u );
glyphsRemoved = true;
}
-
// Not worth to relayout if width or height is equal to zero.
return glyphsRemoved;
}
// Do not re-do any operation until something changes.
mImpl->mOperationsPending = NO_OPERATION;
- if( mImpl->mTextInput )
+ // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
+ CalculateTextAlignment( size );
+
+ if( mImpl->mEventData )
{
// Move the cursor, grab handle etc.
- updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize ) || updated;
+ updated = mImpl->ProcessInputEvents() || updated;
}
return updated;
for( unsigned int i=0; i<events.size(); ++i )
{
- if( REPLACE_TEXT == events[0].type )
+ if( ModifyEvent::REPLACE_TEXT == events[0].type )
{
// A (single) replace event should come first, otherwise we wasted time processing NOOP events
DALI_ASSERT_DEBUG( 0 == i && "Unexpected REPLACE event" );
ReplaceTextEvent( events[0].text );
}
- else if( INSERT_TEXT == events[0].type )
+ else if( ModifyEvent::INSERT_TEXT == events[0].type )
{
InsertTextEvent( events[0].text );
}
- else if( DELETE_TEXT == events[0].type )
+ else if( ModifyEvent::DELETE_TEXT == events[0].type )
{
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->mGlyphsPerCharacter.Clear();
mImpl->mVisualModel->mGlyphPositions.Clear();
mImpl->mVisualModel->mLines.Clear();
+ mImpl->mVisualModel->ClearCaches();
// Convert text into UTF-32
Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
utf32Characters.Resize( characterCount );
// Reset the cursor position
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- mImpl->mTextInput->mPrimaryCursorPosition = characterCount;
+ mImpl->mEventData->mPrimaryCursorPosition = characterCount;
// TODO - handle secondary cursor
}
void Controller::InsertTextEvent( const std::string& text )
{
- DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" );
+ DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertTextEvent" );
// TODO - Optimize this
mImpl->mLogicalModel->mScriptRuns.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->mGlyphsPerCharacter.Clear();
mImpl->mVisualModel->mGlyphPositions.Clear();
mImpl->mVisualModel->mLines.Clear();
+ mImpl->mVisualModel->ClearCaches();
// Convert text into UTF-32
Vector<Character> utf32Characters;
// Insert at current cursor position
Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
- CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition;
+ CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
if( cursorIndex < modifyText.Count() )
{
REORDER );
// Queue a cursor reposition event; this must wait until after DoRelayout()
- mImpl->mTextInput->mUpdateCursorPosition = true;
+ mImpl->mEventData->mUpdateCursorPosition = true;
}
void Controller::DeleteTextEvent()
{
- DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" );
+ DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertTextEvent" );
// TODO - Optimize this
mImpl->mLogicalModel->mScriptRuns.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->mGlyphsPerCharacter.Clear();
mImpl->mVisualModel->mGlyphPositions.Clear();
mImpl->mVisualModel->mLines.Clear();
+ mImpl->mVisualModel->ClearCaches();
// Delte at current cursor position
Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
- CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition;
+ CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
if( cursorIndex > 0 &&
cursorIndex-1 < modifyText.Count() )
REORDER );
// Queue a cursor reposition event; this must wait until after DoRelayout()
- mImpl->mTextInput->mUpdateCursorPosition = true;
+ mImpl->mEventData->mUpdateCursorPosition = true;
}
void Controller::UpdateModel( OperationsMask operationsRequired )
// 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;
glyphs,
glyphsToCharactersMap,
charactersPerGlyph );
+
+ // Create the 'number of glyphs' per character and the glyph to character conversion tables.
+ mImpl->mVisualModel->CreateGlyphsPerCharacterTable( numberOfCharacters );
+ mImpl->mVisualModel->CreateCharacterToGlyphTable( numberOfCharacters );
}
const Length numberOfGlyphs = glyphs.Count();
{
mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), numberOfGlyphs );
}
-
- if( 0u != numberOfGlyphs )
- {
- // Create the glyph to character conversion table and the 'number of glyphs' per character.
- mImpl->mVisualModel->CreateCharacterToGlyphTable(numberOfCharacters );
- mImpl->mVisualModel->CreateGlyphsPerCharacterTable( numberOfCharacters );
- }
}
-bool Controller::DoRelayout( const Vector2& size,
+bool Controller::DoRelayout( const Size& size,
OperationsMask operationsRequired,
Size& layoutSize )
{
Length numberOfGlyphs = mImpl->mVisualModel->GetNumberOfGlyphs();
+ if( 0u == numberOfGlyphs )
+ {
+ // Nothing else to do if there is no glyphs.
+ return true;
+ }
+
Vector<LineBreakInfo>& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo;
Vector<WordBreakInfo>& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo;
+ Vector<CharacterDirection>& characterDirection = mImpl->mLogicalModel->mCharacterDirections;
Vector<GlyphInfo>& glyphs = mImpl->mVisualModel->mGlyphs;
Vector<CharacterIndex>& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters;
Vector<Length>& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph;
mImpl->mLogicalModel->mText.Begin(),
lineBreakInfo.Begin(),
wordBreakInfo.Begin(),
+ ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL,
numberOfGlyphs,
glyphs.Begin(),
glyphsToCharactersMap.Begin(),
if( ALIGN & operations )
{
mImpl->mLayoutEngine.Align( layoutParameters,
+ layoutSize,
lines,
glyphPositions );
}
return viewUpdated;
}
-View& Controller::GetView()
+void Controller::CalculateTextAlignment( const Size& size )
{
- return mImpl->mView;
+ // 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::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment();
+ if( firstParagraphDirection &&
+ ( LayoutEngine::HORIZONTAL_ALIGN_CENTER != horizontalAlignment ) )
+ {
+ if( LayoutEngine::HORIZONTAL_ALIGN_BEGIN == horizontalAlignment )
+ {
+ horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_END;
+ }
+ else
+ {
+ horizontalAlignment = LayoutEngine::HORIZONTAL_ALIGN_BEGIN;
+ }
+ }
+
+ switch( horizontalAlignment )
+ {
+ case LayoutEngine::HORIZONTAL_ALIGN_BEGIN:
+ {
+ mImpl->mAlignmentOffset.x = 0.f;
+ break;
+ }
+ case LayoutEngine::HORIZONTAL_ALIGN_CENTER:
+ {
+ 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::HORIZONTAL_ALIGN_END:
+ {
+ mImpl->mAlignmentOffset.x = size.width - actualSize.width;
+ break;
+ }
+ }
+
+ const LayoutEngine::VerticalAlignment verticalAlignment = mImpl->mLayoutEngine.GetVerticalAlignment();
+ switch( verticalAlignment )
+ {
+ case LayoutEngine::VERTICAL_ALIGN_TOP:
+ {
+ mImpl->mAlignmentOffset.y = 0.f;
+ break;
+ }
+ case LayoutEngine::VERTICAL_ALIGN_CENTER:
+ {
+ const int intOffset = static_cast<int>( 0.5f * ( size.height - actualSize.height ) ); // try to avoid pixel alignment.
+ mImpl->mAlignmentOffset.y = static_cast<float>( intOffset );
+ break;
+ }
+ case LayoutEngine::VERTICAL_ALIGN_BOTTOM:
+ {
+ mImpl->mAlignmentOffset.y = size.height - actualSize.height;
+ break;
+ }
+ }
}
LayoutEngine& Controller::GetLayoutEngine()
return mImpl->mLayoutEngine;
}
-void Controller::RequestRelayout()
+View& Controller::GetView()
{
- mImpl->mControlInterface.RequestTextRelayout();
+ return mImpl->mView;
}
void Controller::KeyboardFocusGainEvent()
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyboardFocusGainEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- TextInput::Event event( TextInput::KEYBOARD_FOCUS_GAIN_EVENT );
- mImpl->mTextInput->mEventQueue.push_back( event );
+ Event event( Event::KEYBOARD_FOCUS_GAIN_EVENT );
+ mImpl->mEventData->mEventQueue.push_back( event );
- RequestRelayout();
+ mImpl->RequestRelayout();
}
}
void Controller::KeyboardFocusLostEvent()
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyboardFocusLostEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- TextInput::Event event( TextInput::KEYBOARD_FOCUS_LOST_EVENT );
- mImpl->mTextInput->mEventQueue.push_back( event );
+ Event event( Event::KEYBOARD_FOCUS_LOST_EVENT );
+ mImpl->mEventData->mEventQueue.push_back( event );
- RequestRelayout();
+ mImpl->RequestRelayout();
}
}
bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent )
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected KeyEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" );
- if( mImpl->mTextInput &&
+ if( mImpl->mEventData &&
keyEvent.state == KeyEvent::Down )
{
int keyCode = keyEvent.keyCode;
Dali::DALI_KEY_CURSOR_UP == keyCode ||
Dali::DALI_KEY_CURSOR_DOWN == keyCode )
{
- TextInput::Event event( TextInput::CURSOR_KEY_EVENT );
+ Event event( Event::CURSOR_KEY_EVENT );
event.p1.mInt = keyCode;
- mImpl->mTextInput->mEventQueue.push_back( event );
+ mImpl->mEventData->mEventQueue.push_back( event );
}
else if( Dali::DALI_KEY_BACKSPACE == keyCode )
{
// Queue a delete event
ModifyEvent event;
- event.type = DELETE_TEXT;
+ event.type = ModifyEvent::DELETE_TEXT;
mImpl->mModifyEvents.push_back( event );
}
else if( !keyString.empty() )
{
// Queue an insert event
ModifyEvent event;
- event.type = INSERT_TEXT;
+ event.type = ModifyEvent::INSERT_TEXT;
event.text = keyString;
mImpl->mModifyEvents.push_back( event );
}
- RequestRelayout();
+ mImpl->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of
+
+ mImpl->RequestRelayout();
}
return false;
void Controller::TapEvent( unsigned int tapCount, float x, float y )
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected TapEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- TextInput::Event event( TextInput::TAP_EVENT );
+ Event event( Event::TAP_EVENT );
event.p1.mUint = tapCount;
event.p2.mFloat = x;
event.p3.mFloat = y;
- mImpl->mTextInput->mEventQueue.push_back( event );
+ mImpl->mEventData->mEventQueue.push_back( event );
- RequestRelayout();
+ mImpl->RequestRelayout();
}
}
void Controller::PanEvent( Gesture::State state, const Vector2& displacement )
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected PanEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- TextInput::Event event( TextInput::PAN_EVENT );
+ Event event( Event::PAN_EVENT );
event.p1.mInt = state;
event.p2.mFloat = displacement.x;
event.p3.mFloat = displacement.y;
- mImpl->mTextInput->mEventQueue.push_back( event );
+ mImpl->mEventData->mEventQueue.push_back( event );
- RequestRelayout();
+ mImpl->RequestRelayout();
}
}
void Controller::GrabHandleEvent( GrabHandleState state, float x, float y )
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected GrabHandleEvent" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- TextInput::Event event( TextInput::GRAB_HANDLE_EVENT );
+ Event event( Event::GRAB_HANDLE_EVENT );
event.p1.mUint = state;
event.p2.mFloat = x;
event.p3.mFloat = y;
- mImpl->mTextInput->mEventQueue.push_back( event );
+
+ mImpl->mEventData->mEventQueue.push_back( event );
- RequestRelayout();
+ mImpl->RequestRelayout();
}
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff