// EXTERNAL INCLUDES
#include <limits>
-#include <vector>
+#include <iostream>
#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();
-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::FontDefaults
+ControllerPtr Controller::New( ControlInterface& controlInterface )
{
- 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;
-};
+ return ControllerPtr( new Controller( controlInterface ) );
+}
-struct Controller::TextInput
+void Controller::SetText( const std::string& text )
{
- // 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;
- }
+ // Cancel previously queued inserts etc.
+ mImpl->mModifyEvents.clear();
- EventType type;
- Param p1;
- Param p2;
- Param p3;
- };
+ // Remove the previously set text
+ ResetText();
- struct CursorInfo
- {
- CursorInfo()
- : primaryPosition(),
- secondaryPosition(),
- lineHeight( 0.f ),
- primaryCursorHeight( 0.f ),
- secondaryCursorHeight( 0.f ),
- isSecondaryCursor( false )
- {}
-
- ~CursorInfo()
- {}
-
- Vector2 primaryPosition; ///< The primary cursor's position.
- Vector2 secondaryPosition; ///< The secondary cursor's position.
- float lineHeight; ///< The height of the line where the cursor is placed.
- float primaryCursorHeight; ///< The primary cursor's height.
- float secondaryCursorHeight; ///< The secondary cursor's height.
- bool isSecondaryCursor; ///< Whether the secondary cursor is valid.
- };
-
- /**
- * @brief Some characters can be shaped in more than one glyph.
- * This struct is used to retrieve metrics from these group of glyphs.
- */
- struct GlyphMetrics
+ if( ! text.empty() )
{
- GlyphMetrics()
- : fontHeight( 0.f ),
- advance( 0.f ),
- ascender( 0.f ),
- xBearing( 0.f )
- {}
-
- ~GlyphMetrics()
- {}
-
- float fontHeight; ///< The font's height of that glyphs.
- float advance; ///< The sum of all the advances of all the glyphs.
- float ascender; ///< The font's ascender.
- float xBearing; ///< The x bearing of the first glyph.
- };
-
- enum State
- {
- INACTIVE,
- SELECTING,
- EDITING,
- EDITING_WITH_POPUP
- };
-
- TextInput( LogicalModelPtr logicalModel,
- VisualModelPtr visualModel,
- DecoratorPtr decorator,
- FontDefaults* fontDefaults,
- TextAbstraction::FontClient& fontClient )
- : mLogicalModel( logicalModel ),
- mVisualModel( visualModel ),
- mDecorator( decorator ),
- mFontDefaults( fontDefaults ),
- mFontClient( fontClient ),
- mState( INACTIVE ),
- mPrimaryCursorPosition( 0u ),
- mSecondaryCursorPosition( 0u ),
- mDecoratorUpdated( false ),
- mCursorBlinkEnabled( true ),
- mGrabHandleEnabled( true ),
- mGrabHandlePopupEnabled( true ),
- mSelectionEnabled( true ),
- mHorizontalScrollingEnabled( true ),
- mVerticalScrollingEnabled( false ),
- mUpdateCursorPosition( false )
- {}
-
- /**
- * @brief Helper to move the cursor, grab handle etc.
- */
- bool ProcessInputEvents( const Vector2& controlSize,
- const Vector2& alignmentOffset )
- {
- 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, alignmentOffset );
- break;
- }
- case PAN_EVENT:
- {
- OnPanEvent( *iter, controlSize, alignmentOffset );
- break;
- }
- case GRAB_HANDLE_EVENT:
- {
- OnGrabHandleEvent( *iter );
- break;
- }
- }
- }
- }
+ // Convert text into UTF-32
+ Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
+ utf32Characters.Resize( text.size() );
- // The cursor must also be repositioned after inserts into the model
- if( mUpdateCursorPosition )
- {
- UpdateCursorPosition();
- mUpdateCursorPosition = false;
- }
+ // This is a bit horrible but std::string returns a (signed) char*
+ const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
- mEventQueue.clear();
+ // Transform a text array encoded in utf8 into an array encoded in utf32.
+ // It returns the actual number of characters.
+ Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() );
+ utf32Characters.Resize( characterCount );
- return mDecoratorUpdated;
- }
-
- void OnKeyboardFocus( bool hasFocus )
- {
- if( !hasFocus )
+ // Reset the cursor position
+ if( mImpl->mEventData )
{
- ChangeState( INACTIVE );
+ mImpl->mEventData->mPrimaryCursorPosition = characterCount;
}
- else
- {
- ChangeState( EDITING );
- }
- }
-
- void OnCursorKeyEvent( const Event& event )
- {
- int keyCode = event.p1.mInt;
- if( Dali::DALI_KEY_CURSOR_LEFT == keyCode )
- {
- if( mPrimaryCursorPosition > 0u )
- {
- mPrimaryCursorPosition = CalculateNewCursorIndex( mPrimaryCursorPosition - 1u );
- }
- }
- else if( Dali::DALI_KEY_CURSOR_RIGHT == keyCode )
- {
- if( mLogicalModel->GetNumberOfCharacters() > mPrimaryCursorPosition )
- {
- mPrimaryCursorPosition = CalculateNewCursorIndex( mPrimaryCursorPosition );
- }
- }
- else if( Dali::DALI_KEY_CURSOR_UP == keyCode )
- {
- // TODO
- }
- else if( Dali::DALI_KEY_CURSOR_DOWN == keyCode )
- {
- // TODO
- }
-
- UpdateCursorPosition();
- }
-
- void HandleCursorKey( int keyCode )
- {
- // TODO
+ // Update the rest of the model during size negotiation
+ mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED );
}
-
- void OnTapEvent( const Event& event,
- const Vector2& alignmentOffset )
- {
- unsigned int tapCount = event.p1.mUint;
-
- if( 1u == tapCount )
- {
- ChangeState( EDITING );
-
- float xPosition = event.p2.mFloat - alignmentOffset.x;
- float yPosition = event.p3.mFloat - alignmentOffset.y;
-
- mPrimaryCursorPosition = GetClosestCursorIndex( xPosition,
- yPosition );
-
- UpdateCursorPosition();
- }
- else if( mSelectionEnabled &&
- 2u == tapCount )
- {
- ChangeState( SELECTING );
-
- RepositionSelectionHandles( event.p2.mFloat, event.p3.mFloat );
- }
- }
-
- 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;
-
- if( GRAB_HANDLE_PRESSED == state )
- {
- float xPosition = event.p2.mFloat + mScrollPosition.x;
- float yPosition = event.p3.mFloat + mScrollPosition.y;
-
- mPrimaryCursorPosition = GetClosestCursorIndex( xPosition,
- yPosition );
-
- UpdateCursorPosition();
-
- //mDecorator->HidePopup();
- ChangeState ( EDITING );
- }
- else if ( mGrabHandlePopupEnabled &&
- GRAB_HANDLE_RELEASED == state )
- {
- //mDecorator->ShowPopup();
- ChangeState ( EDITING_WITH_POPUP );
- mDecoratorUpdated = true;
- }
- }
-
- void RepositionSelectionHandles( float visualX, float visualY )
+ else
{
- // TODO - Find which word was selected
-
- const Vector<GlyphInfo>& glyphs = mVisualModel->mGlyphs;
- const Vector<Vector2>::SizeType glyphCount = glyphs.Count();
-
- const Vector<Vector2>& positions = mVisualModel->mGlyphPositions;
- const Vector<Vector2>::SizeType positionCount = positions.Count();
-
- // Guard against glyphs which did not fit inside the layout
- const Vector<Vector2>::SizeType count = (positionCount < glyphCount) ? positionCount : glyphCount;
-
- if( count )
- {
- float primaryX = positions[0].x;
- float secondaryX = positions[count-1].x + glyphs[count-1].width;
-
- // TODO - multi-line selection
- const Vector<LineRun>& lines = mVisualModel->mLines;
- float height = lines.Count() ? lines[0].ascender + -lines[0].descender : 0.0f;
-
- mDecorator->SetPosition( PRIMARY_SELECTION_HANDLE, primaryX, 0.0f, height );
- mDecorator->SetPosition( SECONDARY_SELECTION_HANDLE, secondaryX, 0.0f, height );
-
- mDecorator->ClearHighlights();
- mDecorator->AddHighlight( primaryX, 0.0f, secondaryX, height );
- }
+ mImpl->ShowPlaceholderText();
}
- void ChangeState( State newState )
+ if( mImpl->mEventData )
{
- if( mState != newState )
- {
- mState = newState;
-
- if( INACTIVE == mState )
- {
- mDecorator->SetActiveCursor( ACTIVE_CURSOR_NONE );
- mDecorator->StopCursorBlink();
- mDecorator->SetGrabHandleActive( false );
- mDecorator->SetSelectionActive( false );
- mDecorator->SetPopupActive( false );
- 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 );
- }
- 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;
- }
- }
+ // Cancel previously queued events
+ mImpl->mEventData->mEventQueue.clear();
}
- LineIndex GetClosestLine( float y ) const
- {
- float totalHeight = 0.f;
- LineIndex lineIndex = 0u;
-
- const Vector<LineRun>& lines = mVisualModel->mLines;
- for( LineIndex endLine = lines.Count();
- lineIndex < endLine;
- ++lineIndex )
- {
- const LineRun& lineRun = lines[lineIndex];
- totalHeight += lineRun.ascender + -lineRun.descender;
- if( y < totalHeight )
- {
- return lineIndex;
- }
- }
-
- return lineIndex-1;
- }
+ // Reset keyboard as text changed
+ mImpl->PreEditReset();
+}
- /**
- * @brief Retrieves the cursor's logical position for a given touch point x,y
- *
- * @param[in] visualX The touch point x.
- * @param[in] visualY The touch point y.
- *
- * @return The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
- */
- CharacterIndex GetClosestCursorIndex( float visualX,
- float visualY ) const
+void Controller::GetText( std::string& text ) const
+{
+ if( ! mImpl->IsShowingPlaceholderText() )
{
- CharacterIndex logicalIndex = 0u;
+ Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
- const Length numberOfGlyphs = mVisualModel->mGlyphs.Count();
- const Length numberOfLines = mVisualModel->mLines.Count();
- if( 0 == numberOfGlyphs ||
- 0 == numberOfLines )
+ if( 0u != utf32Characters.Count() )
{
- return logicalIndex;
- }
-
- // Transform to visual model coords
- visualX -= mScrollPosition.x;
- visualY -= mScrollPosition.y;
-
- // Find which line is closest
- const LineIndex lineIndex = GetClosestLine( visualY );
- const LineRun& line = mVisualModel->mLines[lineIndex];
-
- // Get the positions of the glyphs.
- const Vector<Vector2>& positions = mVisualModel->mGlyphPositions;
- const Vector2* const positionsBuffer = positions.Begin();
-
- // Get the visual to logical conversion tables.
- const CharacterIndex* const visualToLogicalBuffer = ( 0u != mLogicalModel->mVisualToLogicalMap.Count() ) ? mLogicalModel->mVisualToLogicalMap.Begin() : NULL;
- const CharacterIndex* const visualToLogicalCursorBuffer = mLogicalModel->mVisualToLogicalCursorMap.Begin();
-
- // Get the character to glyph conversion table.
- const GlyphIndex* const charactersToGlyphBuffer = mVisualModel->mCharactersToGlyph.Begin();
-
- // Get the glyphs per character table.
- const Length* const glyphsPerCharacterBuffer = mVisualModel->mGlyphsPerCharacter.Begin();
-
- // If the vector is void, there is no right to left characters.
- const bool hasRightToLeftCharacters = NULL != visualToLogicalBuffer;
-
- const CharacterIndex startCharacter = line.characterRun.characterIndex;
- const CharacterIndex endCharacter = line.characterRun.characterIndex + line.characterRun.numberOfCharacters;
- DALI_ASSERT_DEBUG( endCharacter <= mLogicalModel->mText.Count() && "Invalid line info" );
-
- // Whether there is a hit on a glyph.
- bool matched = false;
-
- // Traverses glyphs in visual order. To do that use the visual to logical conversion table.
- CharacterIndex visualIndex = startCharacter;
- for( ; !matched && ( visualIndex < endCharacter ); ++visualIndex )
- {
- // The character in logical order.
- const CharacterIndex characterLogicalOrderIndex = hasRightToLeftCharacters ? *( visualToLogicalBuffer + visualIndex ) : visualIndex;
-
- // 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 );
-
- // Get the metrics for the group of glyphs.
- GlyphMetrics glyphMetrics;
- GetGlyphsMetrics( glyphLogicalOrderIndex,
- numberOfGlyphs,
- glyphMetrics );
-
- const Vector2& position = *( positionsBuffer + glyphLogicalOrderIndex );
+ uint32_t numberOfBytes = GetNumberOfUtf8Bytes( &utf32Characters[0], utf32Characters.Count() );
- const float glyphX = -glyphMetrics.xBearing + position.x + 0.5f * glyphMetrics.advance;
+ text.resize( numberOfBytes );
- if( visualX < glyphX )
- {
- matched = true;
- break;
- }
- }
-
- // Return the logical position of the cursor in characters.
-
- if( !matched )
- {
- visualIndex = endCharacter;
+ // This is a bit horrible but std::string returns a (signed) char*
+ Utf32ToUtf8( &utf32Characters[0], utf32Characters.Count(), reinterpret_cast<uint8_t*>(&text[0]) );
}
-
- return hasRightToLeftCharacters ? *( visualToLogicalCursorBuffer + visualIndex ) : visualIndex;
}
+}
- /**
- * @brief Calculates the cursor's position for a given character index in the logical order.
- *
- * It retrieves as well the line's height and the cursor's height and
- * if there is a valid alternative cursor, its position and height.
- *
- * @param[in] logical The logical cursor position (in characters). 0 is just before the first character, a value equal to the number of characters is just after the last character.
- * @param[out] cursorInfo The line's height, the cursor's height, the cursor's position and whether there is an alternative cursor.
- */
- void GetCursorPosition( CharacterIndex logical,
- CursorInfo& cursorInfo ) const
+unsigned int Controller::GetLogicalCursorPosition() const
+{
+ if( mImpl->mEventData )
{
- // 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->GetNumberOfCharacters() == logical;
-
- if( isFirstPosition && isLastPosition )
- {
- // There is zero characters. Get the default font.
-
- FontId defaultFontId = 0u;
- if( NULL == mFontDefaults )
- {
- defaultFontId = mFontClient.GetFontId( String::EMPTY,
- String::EMPTY );
- }
- else
- {
- defaultFontId = mFontDefaults->GetFontId( mFontClient );
- }
-
- Text::FontMetrics fontMetrics;
- mFontClient.GetFontMetrics( defaultFontId, fontMetrics );
-
- cursorInfo.lineHeight = fontMetrics.ascender - fontMetrics.descender;
- cursorInfo.primaryCursorHeight = cursorInfo.lineHeight;
-
- cursorInfo.primaryPosition.x = 0.f;
- cursorInfo.primaryPosition.y = 0.f;
-
- // Nothing else to do.
- return;
- }
-
- // Get the previous logical index.
- const CharacterIndex previousLogical = isFirstPosition ? 0u : logical - 1u;
-
- // Decrease the logical index if it's the last one.
- if( isLastPosition )
- {
- --logical;
- }
-
- // Get the direction of the character and the previous one.
- const CharacterDirection* const modelCharacterDirectionsBuffer = ( 0u != mLogicalModel->mCharacterDirections.Count() ) ? mLogicalModel->mCharacterDirections.Begin() : NULL;
-
- CharacterDirection isCurrentRightToLeft = false;
- CharacterDirection isPreviousRightToLeft = false;
- if( NULL != modelCharacterDirectionsBuffer ) // If modelCharacterDirectionsBuffer is NULL, it means the whole text is left to right.
- {
- isCurrentRightToLeft = *( modelCharacterDirectionsBuffer + logical );
- isPreviousRightToLeft = *( modelCharacterDirectionsBuffer + previousLogical );
- }
-
- // Get the line where the character is laid-out.
- const LineRun* modelLines = mVisualModel->mLines.Begin();
-
- const LineIndex lineIndex = mVisualModel->GetLineOfCharacter( logical );
- const LineRun& line = *( modelLines + lineIndex );
-
- // Get the paragraph's direction.
- const CharacterDirection isRightToLeftParagraph = line.direction;
-
- // Check whether there is an alternative position:
-
- cursorInfo.isSecondaryCursor = ( isCurrentRightToLeft != isPreviousRightToLeft ) ||
- ( isLastPosition && ( isRightToLeftParagraph != isCurrentRightToLeft ) );
-
- // Set the line height.
- cursorInfo.lineHeight = line.ascender + -line.descender;
-
- // Convert the cursor position into the glyph position.
- CharacterIndex characterIndex = logical;
- if( cursorInfo.isSecondaryCursor &&
- ( isRightToLeftParagraph != isCurrentRightToLeft ) )
- {
- characterIndex = previousLogical;
- }
-
- const GlyphIndex currentGlyphIndex = *( mVisualModel->mCharactersToGlyph.Begin() + characterIndex );
- const Length numberOfGlyphs = *( mVisualModel->mGlyphsPerCharacter.Begin() + characterIndex );
- const Length numberOfCharacters = *( mVisualModel->mCharactersPerGlyph.Begin() +currentGlyphIndex );
-
- // Get the metrics for the group of glyphs.
- GlyphMetrics glyphMetrics;
- GetGlyphsMetrics( currentGlyphIndex,
- numberOfGlyphs,
- glyphMetrics );
-
- float interGlyphAdvance = 0.f;
- if( !isLastPosition &&
- ( numberOfCharacters > 1u ) )
- {
- const CharacterIndex firstIndex = *( mVisualModel->mGlyphsToCharacters.Begin() + currentGlyphIndex );
- interGlyphAdvance = static_cast<float>( characterIndex - firstIndex ) * glyphMetrics.advance / static_cast<float>( numberOfCharacters );
- }
-
- // Get the glyph position and x bearing.
- const Vector2& currentPosition = *( mVisualModel->mGlyphPositions.Begin() + currentGlyphIndex );
-
- // Set the cursor's height.
- cursorInfo.primaryCursorHeight = glyphMetrics.fontHeight;
-
- // Set the position.
- cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + currentPosition.x + ( isCurrentRightToLeft ? glyphMetrics.advance : interGlyphAdvance );
- cursorInfo.primaryPosition.y = line.ascender - glyphMetrics.ascender;
-
- if( isLastPosition )
- {
- // The position of the cursor after the last character needs special
- // care depending on its direction and the direction of the paragraph.
-
- if( cursorInfo.isSecondaryCursor )
- {
- // Need to find the first character after the last character with the paragraph's direction.
- // i.e l0 l1 l2 r0 r1 should find r0.
-
- // TODO: check for more than one line!
- characterIndex = isRightToLeftParagraph ? line.characterRun.characterIndex : line.characterRun.characterIndex + line.characterRun.numberOfCharacters - 1u;
- characterIndex = mLogicalModel->GetLogicalCharacterIndex( characterIndex );
-
- const GlyphIndex glyphIndex = *( mVisualModel->mCharactersToGlyph.Begin() + characterIndex );
- const Length numberOfGlyphs = *( mVisualModel->mGlyphsPerCharacter.Begin() + characterIndex );
-
- const Vector2& position = *( mVisualModel->mGlyphPositions.Begin() + glyphIndex );
-
- // Get the metrics for the group of glyphs.
- GlyphMetrics glyphMetrics;
- GetGlyphsMetrics( glyphIndex,
- numberOfGlyphs,
- glyphMetrics );
-
- cursorInfo.primaryPosition.x = -glyphMetrics.xBearing + position.x + ( isRightToLeftParagraph ? 0.f : glyphMetrics.advance );
-
- cursorInfo.primaryPosition.y = line.ascender - glyphMetrics.ascender;
- }
- else
- {
- if( !isCurrentRightToLeft )
- {
- cursorInfo.primaryPosition.x += glyphMetrics.advance;
- }
- else
- {
- cursorInfo.primaryPosition.x -= glyphMetrics.advance;
- }
- }
- }
-
- // Set the alternative cursor position.
- if( cursorInfo.isSecondaryCursor )
- {
- // Convert the cursor position into the glyph position.
- const CharacterIndex previousCharacterIndex = ( ( isRightToLeftParagraph != isCurrentRightToLeft ) ? logical : previousLogical );
- const GlyphIndex previousGlyphIndex = *( mVisualModel->mCharactersToGlyph.Begin() + previousCharacterIndex );
- const Length numberOfGlyphs = *( mVisualModel->mGlyphsPerCharacter.Begin() + previousCharacterIndex );
-
- // Get the glyph position.
- const Vector2& previousPosition = *( mVisualModel->mGlyphPositions.Begin() + previousGlyphIndex );
-
- // Get the metrics for the group of glyphs.
- GlyphMetrics glyphMetrics;
- GetGlyphsMetrics( previousGlyphIndex,
- numberOfGlyphs,
- glyphMetrics );
-
- // Set the cursor position and height.
- cursorInfo.secondaryPosition.x = -glyphMetrics.xBearing + previousPosition.x + ( ( ( isLastPosition && !isCurrentRightToLeft ) ||
- ( !isLastPosition && isCurrentRightToLeft ) ) ? glyphMetrics.advance : 0.f );
-
- cursorInfo.secondaryCursorHeight = 0.5f * glyphMetrics.fontHeight;
-
- cursorInfo.secondaryPosition.y = cursorInfo.lineHeight - cursorInfo.secondaryCursorHeight - line.descender - ( glyphMetrics.fontHeight - glyphMetrics.ascender );
-
- // Update the primary cursor height as well.
- cursorInfo.primaryCursorHeight *= 0.5f;
- }
+ return mImpl->mEventData->mPrimaryCursorPosition;
}
- /**
- * @brief Get some glyph's metrics of a group of glyphs formed as a result of shaping one character.
- *
- * @param[in] glyphIndex The index to the first glyph.
- * @param[in] numberOfGlyphs The number of glyphs.
- * @param[out] glyphMetrics Some glyph metrics (font height, advance, ascender and x bearing).
- */
- void GetGlyphsMetrics( GlyphIndex glyphIndex,
- Length numberOfGlyphs,
- GlyphMetrics& glyphMetrics ) const
- {
- const GlyphInfo* glyphsBuffer = mVisualModel->mGlyphs.Begin();
-
- const GlyphInfo& firstGlyph = *( glyphsBuffer + glyphIndex );
-
- Text::FontMetrics fontMetrics;
- mFontClient.GetFontMetrics( firstGlyph.fontId, fontMetrics );
-
- glyphMetrics.fontHeight = fontMetrics.height;
- glyphMetrics.advance = firstGlyph.advance;
- glyphMetrics.ascender = fontMetrics.ascender;
- glyphMetrics.xBearing = firstGlyph.xBearing;
-
- for( unsigned int i = 1u; i < numberOfGlyphs; ++i )
- {
- const GlyphInfo& glyphInfo = *( glyphsBuffer + glyphIndex + i );
-
- glyphMetrics.advance += glyphInfo.advance;
- }
- }
+ return 0u;
+}
- /**
- * @brief Calculates the new cursor index.
- *
- * It takes into account that in some scripts multiple characters can form a glyph and all of them
- * need to be jumped with one key event.
- *
- * @param[in] index The initial new index.
- *
- * @return The new cursor index.
- */
- CharacterIndex CalculateNewCursorIndex( CharacterIndex index ) const
+void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text )
+{
+ if( mImpl->mEventData )
{
- CharacterIndex cursorIndex = mPrimaryCursorPosition;
-
- const Script script = mLogicalModel->GetScript( index );
- const GlyphIndex* charactersToGlyphBuffer = mVisualModel->mCharactersToGlyph.Begin();
- const Length* charactersPerGlyphBuffer = mVisualModel->mCharactersPerGlyph.Begin();
-
- Length numberOfCharacters = 0u;
- if( TextAbstraction::LATIN == script )
- {
- // Prevents to jump the whole Latin ligatures like fi, ff, ...
- numberOfCharacters = 1u;
- }
- else
- {
- GlyphIndex glyphIndex = *( charactersToGlyphBuffer + index );
- numberOfCharacters = *( charactersPerGlyphBuffer + glyphIndex );
-
- while( 0u == numberOfCharacters )
- {
- numberOfCharacters = *( charactersPerGlyphBuffer + glyphIndex );
- ++glyphIndex;
- }
- }
-
- if( index < mPrimaryCursorPosition )
+ if( PLACEHOLDER_TYPE_INACTIVE == type )
{
- cursorIndex -= numberOfCharacters;
+ mImpl->mEventData->mPlaceholderTextInactive = text;
}
else
{
- cursorIndex += numberOfCharacters;
+ mImpl->mEventData->mPlaceholderTextActive = text;
}
- return cursorIndex;
+ mImpl->ShowPlaceholderText();
}
+}
- void UpdateCursorPosition()
+void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const
+{
+ if( mImpl->mEventData )
{
- CursorInfo cursorInfo;
-
- GetCursorPosition( mPrimaryCursorPosition,
- cursorInfo );
-
- mDecorator->SetPosition( PRIMARY_CURSOR,
- cursorInfo.primaryPosition.x,
- cursorInfo.primaryPosition.y,
- cursorInfo.primaryCursorHeight,
- cursorInfo.lineHeight );
-
- if( cursorInfo.isSecondaryCursor )
+ if( PLACEHOLDER_TYPE_INACTIVE == type )
{
- mDecorator->SetActiveCursor( ACTIVE_CURSOR_BOTH );
- mDecorator->SetPosition( SECONDARY_CURSOR,
- cursorInfo.secondaryPosition.x,
- cursorInfo.secondaryPosition.y,
- cursorInfo.secondaryCursorHeight,
- cursorInfo.lineHeight );
+ text = mImpl->mEventData->mPlaceholderTextInactive;
}
else
{
- mDecorator->SetActiveCursor( ACTIVE_CURSOR_PRIMARY );
+ text = mImpl->mEventData->mPlaceholderTextActive;
}
-
- mUpdateCursorPosition = false;
- mDecoratorUpdated = true;
- }
-
- LogicalModelPtr mLogicalModel;
- VisualModelPtr mVisualModel;
- DecoratorPtr mDecorator;
- FontDefaults* mFontDefaults;
- TextAbstraction::FontClient& mFontClient;
- 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::Impl
-{
- Impl( ControlInterface& controlInterface )
- : mControlInterface( controlInterface ),
- mLogicalModel(),
- mVisualModel(),
- mFontDefaults( NULL ),
- mTextInput( NULL ),
- mFontClient(),
- mView(),
- mLayoutEngine(),
- mModifyEvents(),
- mControlSize(),
- mAlignmentOffset(),
- mOperationsPending( NO_OPERATION ),
- mRecalculateNaturalSize( true )
- {
- mLogicalModel = LogicalModel::New();
- mVisualModel = VisualModel::New();
-
- mFontClient = TextAbstraction::FontClient::Get();
-
- mView.SetVisualModel( mVisualModel );
-
- // Set the text properties to default
- mVisualModel->SetTextColor( Color::WHITE );
- mVisualModel->SetShadowOffset( Vector2::ZERO );
- mVisualModel->SetShadowColor( Vector4::ZERO );
- mVisualModel->SetUnderlineEnabled( false );
- }
-
- ~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.
- 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.
-};
-
-ControllerPtr Controller::New( ControlInterface& controlInterface )
-{
- return ControllerPtr( new Controller( controlInterface ) );
-}
-
-void Controller::SetText( const std::string& text )
-{
- // Cancel previously queued inserts etc.
- mImpl->mModifyEvents.clear();
-
- // Keep until size negotiation
- ModifyEvent event;
- event.type = REPLACE_TEXT;
- event.text = text;
- mImpl->mModifyEvents.push_back( event );
-
- if( mImpl->mTextInput )
- {
- // Cancel previously queued events
- mImpl->mTextInput->mEventQueue.clear();
-
- // TODO - Hide selection decorations
- }
-}
-
-void Controller::GetText( std::string& text ) const
-{
- if( !mImpl->mModifyEvents.empty() &&
- REPLACE_TEXT == mImpl->mModifyEvents[0].type )
- {
- text = mImpl->mModifyEvents[0].text;
- }
- else
- {
- // TODO - Convert from UTF-32
}
}
-void Controller::SetPlaceholderText( const std::string& text )
+void Controller::SetMaximumNumberOfCharacters( int maxCharacters )
{
- if( !mImpl->mTextInput )
+ if ( maxCharacters >= 0 )
{
- mImpl->mTextInput->mPlaceholderText = text;
+ mImpl->mMaximumNumberOfCharacters = maxCharacters;
}
}
-void Controller::GetPlaceholderText( std::string& text ) const
+int Controller::GetMaximumNumberOfCharacters()
{
- if( !mImpl->mTextInput )
- {
- text = mImpl->mTextInput->mPlaceholderText;
- }
+ return mImpl->mMaximumNumberOfCharacters;
}
void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily )
{
if( !mImpl->mFontDefaults )
{
- mImpl->mFontDefaults = new Controller::FontDefaults();
+ mImpl->mFontDefaults = new FontDefaults();
}
mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily;
mImpl->mVisualModel->mLines.Clear();
mImpl->mVisualModel->ClearCaches();
- RequestRelayout();
+ mImpl->RequestRelayout();
}
const std::string& Controller::GetDefaultFontFamily() const
return mImpl->mFontDefaults->mDefaultFontFamily;
}
- return String::EMPTY;;
+ return EMPTY_STRING;
}
void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle )
{
if( !mImpl->mFontDefaults )
{
- mImpl->mFontDefaults = new Controller::FontDefaults();
+ mImpl->mFontDefaults = new FontDefaults();
}
mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle;
mImpl->mVisualModel->mLines.Clear();
mImpl->mVisualModel->ClearCaches();
- RequestRelayout();
+ mImpl->RequestRelayout();
}
const std::string& Controller::GetDefaultFontStyle() const
return mImpl->mFontDefaults->mDefaultFontStyle;
}
- return String::EMPTY;
+ return EMPTY_STRING;
}
void Controller::SetDefaultPointSize( float pointSize )
{
if( !mImpl->mFontDefaults )
{
- mImpl->mFontDefaults = new Controller::FontDefaults();
+ mImpl->mFontDefaults = new FontDefaults();
}
mImpl->mFontDefaults->mDefaultPointSize = pointSize;
mImpl->mVisualModel->mLines.Clear();
mImpl->mVisualModel->ClearCaches();
- RequestRelayout();
+ mImpl->RequestRelayout();
}
float Controller::GetDefaultPointSize() const
return 0.0f;
}
-void Controller::GetDefaultFonts( Vector<FontRun>& fonts, Length numberOfCharacters ) const
+void Controller::SetTextColor( const Vector4& textColor )
{
- if( mImpl->mFontDefaults )
- {
- FontRun fontRun;
- fontRun.characterRun.characterIndex = 0;
- fontRun.characterRun.numberOfCharacters = numberOfCharacters;
- fontRun.fontId = mImpl->mFontDefaults->GetFontId( mImpl->mFontClient );
- fontRun.isDefault = true;
+ mImpl->mTextColor = textColor;
- fonts.PushBack( fontRun );
+ if( ! mImpl->IsShowingPlaceholderText() )
+ {
+ mImpl->mVisualModel->SetTextColor( textColor );
}
}
const Vector4& Controller::GetTextColor() const
{
- return mImpl->mVisualModel->GetTextColor();
+ return mImpl->mTextColor;
}
-const Vector2& Controller::GetShadowOffset() const
+bool Controller::RemoveText( int cursorOffset, int numberOfChars )
{
- return mImpl->mVisualModel->GetShadowOffset();
-}
+ bool removed( false );
-const Vector4& Controller::GetShadowColor() const
-{
- return mImpl->mVisualModel->GetShadowColor();
-}
+ if( ! mImpl->IsShowingPlaceholderText() )
+ {
+ // Delete at current cursor position
+ Vector<Character>& currentText = mImpl->mLogicalModel->mText;
+ CharacterIndex& oldCursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
-const Vector4& Controller::GetUnderlineColor() const
-{
- return mImpl->mVisualModel->GetUnderlineColor();
+ CharacterIndex cursorIndex = oldCursorIndex;
+
+ // Validate the cursor position & number of characters
+ if( static_cast< CharacterIndex >( std::abs( cursorOffset ) ) <= cursorIndex )
+ {
+ cursorIndex = oldCursorIndex + cursorOffset;
+ }
+
+ if( (cursorIndex + numberOfChars) > currentText.Count() )
+ {
+ numberOfChars = currentText.Count() - cursorIndex;
+ }
+
+ if( cursorIndex >= 0 &&
+ (cursorIndex + numberOfChars) <= currentText.Count() )
+ {
+ Vector<Character>::Iterator first = currentText.Begin() + cursorIndex;
+ Vector<Character>::Iterator last = first + numberOfChars;
+
+ currentText.Erase( first, last );
+
+ // Cursor position retreat
+ oldCursorIndex = cursorIndex;
+
+ removed = true;
+ }
+ }
+
+ return removed;
}
-bool Controller::IsUnderlineEnabled() const
+void Controller::SetPlaceholderTextColor( const Vector4& textColor )
{
- return mImpl->mVisualModel->IsUnderlineEnabled();
+ if( mImpl->mEventData )
+ {
+ mImpl->mEventData->mPlaceholderTextColor = textColor;
+ }
+
+ if( mImpl->IsShowingPlaceholderText() )
+ {
+ mImpl->mVisualModel->SetTextColor( textColor );
+ }
}
-void Controller::SetTextColor( const Vector4& textColor )
+const Vector4& Controller::GetPlaceholderTextColor() const
{
- mImpl->mVisualModel->SetTextColor( textColor );
+ if( mImpl->mEventData )
+ {
+ return mImpl->mEventData->mPlaceholderTextColor;
+ }
+
+ return Color::BLACK;
}
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->mFontDefaults,
- mImpl->mFontClient );
+ 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;
SHAPE_TEXT |
GET_GLYPH_METRICS );
// Make sure the model is up-to-date before layouting
- UpdateModel( onlyOnceOperations );
+ mImpl->UpdateModel( onlyOnceOperations );
// Operations that need to be done if the size changes.
const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
SHAPE_TEXT |
GET_GLYPH_METRICS );
// Make sure the model is up-to-date before layouting
- UpdateModel( onlyOnceOperations );
+ mImpl->UpdateModel( onlyOnceOperations );
// Operations that need to be done if the size changes.
const OperationsMask sizeOperations = static_cast<OperationsMask>( LAYOUT |
mImpl->mVisualModel->SetGlyphPositions( NULL, 0u );
glyphsRemoved = true;
}
-
// Not worth to relayout if width or height is equal to zero.
return glyphsRemoved;
}
// Make sure the model is up-to-date before layouting
ProcessModifyEvents();
- UpdateModel( mImpl->mOperationsPending );
+ mImpl->UpdateModel( mImpl->mOperationsPending );
Size layoutSize;
bool updated = DoRelayout( mImpl->mControlSize,
// After doing the text layout, the alignment offset to place the actor in the desired position can be calculated.
CalculateTextAlignment( size );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
// Move the cursor, grab handle etc.
- updated = mImpl->mTextInput->ProcessInputEvents( mImpl->mControlSize, mImpl->mAlignmentOffset ) || updated;
+ updated = mImpl->ProcessInputEvents() || updated;
}
return updated;
for( unsigned int i=0; i<events.size(); ++i )
{
- if( REPLACE_TEXT == events[0].type )
+ if( ModifyEvent::PLACEHOLDER_TEXT == events[0].type )
+ {
+ // Use placeholder if text is empty
+ if( 0u == mImpl->mLogicalModel->mText.Count() &&
+ mImpl->IsShowingPlaceholderText() )
+ {
+ mImpl->ReplaceTextWithPlaceholder();
+ }
+ }
+ else if( ModifyEvent::TEXT_REPLACED == 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" );
+ DALI_ASSERT_DEBUG( 0 == i && "Unexpected TEXT_REPLACED event" );
- ReplaceTextEvent( events[0].text );
+ TextReplacedEvent();
}
- else if( INSERT_TEXT == events[0].type )
+ else if( ModifyEvent::TEXT_INSERTED == events[0].type )
{
- InsertTextEvent( events[0].text );
+ TextInsertedEvent();
}
- else if( DELETE_TEXT == events[0].type )
+ else if( ModifyEvent::TEXT_DELETED == events[0].type )
{
- DeleteTextEvent();
+ // Placeholder-text cannot be deleted
+ if( !mImpl->IsShowingPlaceholderText() )
+ {
+ TextDeletedEvent();
+ }
}
}
events.clear();
}
-void Controller::ReplaceTextEvent( const std::string& text )
+void Controller::ResetText()
{
// Reset buffers.
mImpl->mLogicalModel->mText.Clear();
mImpl->mVisualModel->mLines.Clear();
mImpl->mVisualModel->ClearCaches();
- // Convert text into UTF-32
- Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
- utf32Characters.Resize( text.size() );
-
- // This is a bit horrible but std::string returns a (signed) char*
- const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
-
- // Transform a text array encoded in utf8 into an array encoded in utf32.
- // It returns the actual number of characters.
- Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() );
- utf32Characters.Resize( characterCount );
-
// Reset the cursor position
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- mImpl->mTextInput->mPrimaryCursorPosition = characterCount;
- // TODO - handle secondary cursor
+ mImpl->mEventData->mPrimaryCursorPosition = 0;
}
+ // We have cleared everything including the placeholder-text
+ mImpl->PlaceholderCleared();
+
+ // The natural size needs to be re-calculated.
+ mImpl->mRecalculateNaturalSize = true;
+
+ // Apply modifications to the model
+ mImpl->mOperationsPending = ALL_OPERATIONS;
+}
+
+void Controller::TextReplacedEvent()
+{
+ // Reset buffers.
+ 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();
+ mImpl->mVisualModel->ClearCaches();
+
// The natural size needs to be re-calculated.
mImpl->mRecalculateNaturalSize = true;
// Apply modifications to the model
mImpl->mOperationsPending = ALL_OPERATIONS;
- UpdateModel( ALL_OPERATIONS );
+ mImpl->UpdateModel( ALL_OPERATIONS );
mImpl->mOperationsPending = static_cast<OperationsMask>( LAYOUT |
ALIGN |
UPDATE_ACTUAL_SIZE |
REORDER );
}
-void Controller::InsertTextEvent( const std::string& text )
+void Controller::TextInsertedEvent()
{
- DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" );
+ DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" );
// TODO - Optimize this
mImpl->mLogicalModel->mScriptRuns.Clear();
mImpl->mVisualModel->mLines.Clear();
mImpl->mVisualModel->ClearCaches();
- // Convert text into UTF-32
- Vector<Character> utf32Characters;
- utf32Characters.Resize( text.size() );
-
- // This is a bit horrible but std::string returns a (signed) char*
- const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
-
- // Transform a text array encoded in utf8 into an array encoded in utf32.
- // It returns the actual number of characters.
- Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() );
- utf32Characters.Resize( characterCount );
-
- // Insert at current cursor position
- Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
- CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition;
-
- if( cursorIndex < modifyText.Count() )
- {
- modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.End() );
- }
- else
- {
- modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.End() );
- }
-
- // Advance the cursor position
- ++cursorIndex;
-
// The natural size needs to be re-calculated.
mImpl->mRecalculateNaturalSize = true;
// Apply modifications to the model; TODO - Optimize this
mImpl->mOperationsPending = ALL_OPERATIONS;
- UpdateModel( ALL_OPERATIONS );
+ mImpl->UpdateModel( ALL_OPERATIONS );
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;
+ mImpl->mEventData->mUpdateCursorPosition = true;
+ mImpl->mEventData->mScrollAfterUpdateCursorPosition = true;
}
-void Controller::DeleteTextEvent()
+void Controller::TextDeletedEvent()
{
- DALI_ASSERT_DEBUG( NULL != mImpl->mTextInput && "Unexpected InsertTextEvent" );
+ DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" );
// TODO - Optimize this
mImpl->mLogicalModel->mScriptRuns.Clear();
mImpl->mVisualModel->mLines.Clear();
mImpl->mVisualModel->ClearCaches();
- // Delte at current cursor position
- Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
- CharacterIndex& cursorIndex = mImpl->mTextInput->mPrimaryCursorPosition;
-
- if( cursorIndex > 0 &&
- cursorIndex-1 < modifyText.Count() )
- {
- modifyText.Remove( modifyText.Begin() + cursorIndex - 1 );
-
- // Cursor position retreat
- --cursorIndex;
- }
-
// The natural size needs to be re-calculated.
mImpl->mRecalculateNaturalSize = true;
// Apply modifications to the model; TODO - Optimize this
mImpl->mOperationsPending = ALL_OPERATIONS;
- UpdateModel( ALL_OPERATIONS );
+ mImpl->UpdateModel( ALL_OPERATIONS );
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 )
-{
- // Calculate the operations to be done.
- const OperationsMask operations = static_cast<OperationsMask>( mImpl->mOperationsPending & operationsRequired );
-
- Vector<Character>& utf32Characters = mImpl->mLogicalModel->mText;
-
- const Length numberOfCharacters = mImpl->mLogicalModel->GetNumberOfCharacters();
-
- Vector<LineBreakInfo>& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo;
- if( GET_LINE_BREAKS & operations )
- {
- // Retrieves the line break info. The line break info is used to split the text in 'paragraphs' to
- // calculate the bidirectional info for each 'paragraph'.
- // It's also used to layout the text (where it should be a new line) or to shape the text (text in different lines
- // is not shaped together).
- lineBreakInfo.Resize( numberOfCharacters, TextAbstraction::LINE_NO_BREAK );
-
- SetLineBreakInfo( utf32Characters,
- lineBreakInfo );
- }
-
- Vector<WordBreakInfo>& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo;
- if( GET_WORD_BREAKS & operations )
- {
- // Retrieves the word break info. The word break info is used to layout the text (where to wrap the text in lines).
- wordBreakInfo.Resize( numberOfCharacters, TextAbstraction::WORD_NO_BREAK );
-
- SetWordBreakInfo( utf32Characters,
- wordBreakInfo );
- }
-
- const bool getScripts = GET_SCRIPTS & operations;
- const bool validateFonts = VALIDATE_FONTS & operations;
-
- Vector<ScriptRun>& scripts = mImpl->mLogicalModel->mScriptRuns;
- Vector<FontRun>& validFonts = mImpl->mLogicalModel->mFontRuns;
-
- if( getScripts || validateFonts )
- {
- // Validates the fonts assigned by the application or assigns default ones.
- // It makes sure all the characters are going to be rendered by the correct font.
- MultilanguageSupport multilanguageSupport = MultilanguageSupport::Get();
-
- if( getScripts )
- {
- // Retrieves the scripts used in the text.
- multilanguageSupport.SetScripts( utf32Characters,
- lineBreakInfo,
- scripts );
- }
-
- if( validateFonts )
- {
- if( 0u == validFonts.Count() )
- {
- // Copy the requested font defaults received via the property system.
- // These may not be valid i.e. may not contain glyphs for the necessary scripts.
- GetDefaultFonts( validFonts, numberOfCharacters );
- }
-
- // Validates the fonts. If there is a character with no assigned font it sets a default one.
- // After this call, fonts are validated.
- multilanguageSupport.ValidateFonts( utf32Characters,
- scripts,
- validFonts );
- }
- }
-
- 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
- // bidirectional info.
-
- Length numberOfParagraphs = 0u;
-
- const TextAbstraction::LineBreakInfo* lineBreakInfoBuffer = lineBreakInfo.Begin();
- for( Length index = 0u; index < numberOfCharacters; ++index )
- {
- if( TextAbstraction::LINE_NO_BREAK == *( lineBreakInfoBuffer + index ) )
- {
- ++numberOfParagraphs;
- }
- }
-
- Vector<BidirectionalParagraphInfoRun>& bidirectionalInfo = mImpl->mLogicalModel->mBidirectionalParagraphInfo;
- bidirectionalInfo.Reserve( numberOfParagraphs );
-
- // Calculates the bidirectional info for the whole paragraph if it contains right to left scripts.
- SetBidirectionalInfo( utf32Characters,
- 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( textToShape,
- lineBreakInfo,
- scripts,
- validFonts,
- 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();
-
- if( GET_GLYPH_METRICS & operations )
- {
- mImpl->mFontClient.GetGlyphMetrics( glyphs.Begin(), numberOfGlyphs );
- }
+ mImpl->mEventData->mUpdateCursorPosition = true;
+ mImpl->mEventData->mScrollAfterUpdateCursorPosition = true;
}
bool Controller::DoRelayout( const Size& size,
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(),
}
}
-View& Controller::GetView()
-{
- return mImpl->mView;
-}
-
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;
- mImpl->mModifyEvents.push_back( event );
+ // Remove the character before the current cursor position
+ bool removed = RemoveText( -1, 1 );
+
+ if( removed )
+ {
+ if( 0u == mImpl->mLogicalModel->mText.Count() )
+ {
+ mImpl->ShowPlaceholderText();
+ }
+ else
+ {
+ mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED );
+ }
+ }
}
- else if( !keyString.empty() )
+ else
{
- // Queue an insert event
- ModifyEvent event;
- event.type = INSERT_TEXT;
- event.text = keyString;
- mImpl->mModifyEvents.push_back( event );
+ InsertText( keyString, COMMIT );
}
- mImpl->mTextInput->ChangeState( TextInput::EDITING ); // todo Confirm this is the best place to change the state of
+ mImpl->ChangeState( EventData::EDITING ); // todo Confirm this is the best place to change the state of
- RequestRelayout();
+ mImpl->RequestRelayout();
}
return false;
}
+void Controller::InsertText( const std::string& text, Controller::InsertType type )
+{
+ bool removedPreEdit( false );
+ bool maxLengthReached( false );
+
+ if( ! text.empty() )
+ {
+ if( mImpl->IsShowingPlaceholderText() )
+ {
+ ResetText();
+ }
+ }
+
+ if( mImpl->mEventData )
+ {
+ if( COMMIT == type )
+ {
+ mImpl->mEventData->mPreEditFlag = false;
+ }
+ else // PRE_EDIT
+ {
+ if( mImpl->mEventData->mPreEditFlag &&
+ 0 != mImpl->mEventData->mPreEditLength )
+ {
+ // Remove previous pre-edit text
+ mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition;
+ removedPreEdit = RemoveText( -1, mImpl->mEventData->mPreEditLength );
+ }
+ else
+ {
+ // Record the start of the pre-edit text
+ mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition;
+ mImpl->mEventData->mPreEditLength = text.size();
+ }
+
+ mImpl->mEventData->mPreEditFlag = true;
+ }
+ }
+
+ if( ! text.empty() )
+ {
+ // Convert text into UTF-32
+ Vector<Character> utf32Characters;
+ utf32Characters.Resize( text.size() );
+
+ // This is a bit horrible but std::string returns a (signed) char*
+ const uint8_t* utf8 = reinterpret_cast<const uint8_t*>( text.c_str() );
+
+ // Transform a text array encoded in utf8 into an array encoded in utf32.
+ // It returns the actual number of characters.
+ Length characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() );
+ utf32Characters.Resize( characterCount );
+
+ const Length numberOfCharactersInModel = mImpl->mLogicalModel->GetNumberOfCharacters();
+
+ // Restrict new text to fit within Maximum characters setting
+ Length maxSizeOfNewText = std::min ( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount );
+ maxLengthReached = ( characterCount > maxSizeOfNewText );
+
+ // Insert at current cursor position
+ CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition;
+
+ Vector<Character>& modifyText = mImpl->mLogicalModel->mText;
+
+ if( cursorIndex < numberOfCharactersInModel )
+ {
+ modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText );
+ }
+ else
+ {
+ modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText );
+ }
+
+ cursorIndex += maxSizeOfNewText;
+ }
+
+ if( removedPreEdit || !text.empty() )
+ {
+ // Queue an inserted event
+ mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED );
+ }
+
+ if( maxLengthReached )
+ {
+ mImpl->mControlInterface.MaxLengthReached();
+
+ mImpl->PreEditReset();
+ }
+}
+
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();
}
+
+ // Reset keyboard as tap event has occurred.
+ mImpl->PreEditReset();
}
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 )
+void Controller::HandleEvent( HandleType handleType, HandleState state, float x, float y )
{
- DALI_ASSERT_DEBUG( mImpl->mTextInput && "Unexpected GrabHandleEvent" );
+ DALI_ASSERT_DEBUG( mImpl->mEventData && "Controller::HandleEvent. Unexpected HandleEvent" );
- if( mImpl->mTextInput )
+ if( mImpl->mEventData )
{
- TextInput::Event event( TextInput::GRAB_HANDLE_EVENT );
- event.p1.mUint = state;
- event.p2.mFloat = x;
- event.p3.mFloat = y;
- mImpl->mTextInput->mEventQueue.push_back( event );
+ switch( handleType )
+ {
+ case GRAB_HANDLE:
+ {
+ Event event( Event::GRAB_HANDLE_EVENT );
+ event.p1.mUint = state;
+ event.p2.mFloat = x;
+ event.p3.mFloat = y;
+
+ mImpl->mEventData->mEventQueue.push_back( event );
+ break;
+ }
+ case LEFT_SELECTION_HANDLE:
+ {
+ Event event( Event::LEFT_SELECTION_HANDLE_EVENT );
+ event.p1.mUint = state;
+ event.p2.mFloat = x;
+ event.p3.mFloat = y;
+
+ mImpl->mEventData->mEventQueue.push_back( event );
+ break;
+ }
+ case RIGHT_SELECTION_HANDLE:
+ {
+ Event event( Event::RIGHT_SELECTION_HANDLE_EVENT );
+ event.p1.mUint = state;
+ event.p2.mFloat = x;
+ event.p3.mFloat = y;
+
+ mImpl->mEventData->mEventQueue.push_back( event );
+ break;
+ }
+ case HANDLE_TYPE_COUNT:
+ {
+ DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" );
+ }
+ }
- RequestRelayout();
+ mImpl->RequestRelayout();
}
}
projects / platform / core / uifw / dali-toolkit.git / blobdiff