X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=e990d42f722319d20eb2a5b06cbb17f53e6bc2ea;hp=3b9c7256a27cf588bdb662d972e0191b0edca916;hb=f39a0555fc2897d94a4984712e219e452bc96d70;hpb=05c921f5db43f63d6ebfe7e6836a32113a9da9b9 diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp index 3b9c725..e990d42 100644 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -20,7 +20,6 @@ // EXTERNAL INCLUDES #include -#include #include #include #include @@ -29,24 +28,20 @@ #include #include #include -#include -#include -#include -#include #include -#include -#include namespace { #if defined(DEBUG_ENABLED) - Debug::Filter* gLogFilter = Debug::Filter::New(Debug::Concise, true, "LOG_TEXT_CONTROLS"); + Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, true, "LOG_TEXT_CONTROLS"); #endif const float MAX_FLOAT = std::numeric_limits::max(); +const unsigned int POINTS_PER_INCH = 72; const std::string EMPTY_STRING(""); +const unsigned int ZERO = 0u; float ConvertToEven( float value ) { @@ -80,6 +75,11 @@ void Controller::EnableTextInput( DecoratorPtr decorator ) void Controller::SetText( const std::string& text ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); + + // Reset keyboard as text changed + mImpl->ResetImfManager(); + // Remove the previously set text ResetText(); @@ -88,9 +88,9 @@ void Controller::SetText( const std::string& text ) if( mImpl->mEventData ) { // If popup shown then hide it by switching to Editing state - if ( EventData::SELECTING == mImpl->mEventData->mState || - EventData::SELECTION_CHANGED == mImpl->mEventData->mState || - EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) + if( ( EventData::SELECTING == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) ) { mImpl->ChangeState( EventData::EDITING ); } @@ -144,8 +144,8 @@ void Controller::SetText( const std::string& text ) mImpl->mEventData->mEventQueue.clear(); } - // Reset keyboard as text changed - mImpl->ResetImfManager(); + // Notify IMF as text changed + NotifyImfManager(); // Do this last since it provides callbacks into application code mImpl->mControlInterface.TextChanged(); @@ -235,7 +235,9 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) mImpl->mFontDefaults = new FontDefaults(); } - mImpl->mFontDefaults->mDefaultFontFamily = defaultFontFamily; + mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily; + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str()); + mImpl->mUserDefinedFontFamily = true; // Clear the font-specific data ClearFontData(); @@ -250,20 +252,40 @@ const std::string& Controller::GetDefaultFontFamily() const { if( mImpl->mFontDefaults ) { - return mImpl->mFontDefaults->mDefaultFontFamily; + return mImpl->mFontDefaults->mFontDescription.family; } return EMPTY_STRING; } -void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) +void Controller::SetDefaultFontStyle( const std::string& style ) { if( !mImpl->mFontDefaults ) { mImpl->mFontDefaults = new FontDefaults(); } - mImpl->mFontDefaults->mDefaultFontStyle = defaultFontStyle; + mImpl->mFontDefaults->mFontStyle = style; +} + +const std::string& Controller::GetDefaultFontStyle() const +{ + if( mImpl->mFontDefaults ) + { + return mImpl->mFontDefaults->mFontStyle; + } + + return EMPTY_STRING; +} + +void Controller::SetDefaultFontWidth( FontWidth width ) +{ + if( !mImpl->mFontDefaults ) + { + mImpl->mFontDefaults = new FontDefaults(); + } + + mImpl->mFontDefaults->mFontDescription.width = width; // Clear the font-specific data ClearFontData(); @@ -274,14 +296,70 @@ void Controller::SetDefaultFontStyle( const std::string& defaultFontStyle ) mImpl->RequestRelayout(); } -const std::string& Controller::GetDefaultFontStyle() const +FontWidth Controller::GetDefaultFontWidth() const { if( mImpl->mFontDefaults ) { - return mImpl->mFontDefaults->mDefaultFontStyle; + return mImpl->mFontDefaults->mFontDescription.width; } - return EMPTY_STRING; + return TextAbstraction::FontWidth::NORMAL; +} + +void Controller::SetDefaultFontWeight( FontWeight weight ) +{ + if( !mImpl->mFontDefaults ) + { + mImpl->mFontDefaults = new FontDefaults(); + } + + mImpl->mFontDefaults->mFontDescription.weight = weight; + + // Clear the font-specific data + ClearFontData(); + + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); +} + +FontWeight Controller::GetDefaultFontWeight() const +{ + if( mImpl->mFontDefaults ) + { + return mImpl->mFontDefaults->mFontDescription.weight; + } + + return TextAbstraction::FontWeight::NORMAL; +} + +void Controller::SetDefaultFontSlant( FontSlant slant ) +{ + if( !mImpl->mFontDefaults ) + { + mImpl->mFontDefaults = new FontDefaults(); + } + + mImpl->mFontDefaults->mFontDescription.slant = slant; + + // Clear the font-specific data + ClearFontData(); + + mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->mRecalculateNaturalSize = true; + + mImpl->RequestRelayout(); +} + +FontSlant Controller::GetDefaultFontSlant() const +{ + if( mImpl->mFontDefaults ) + { + return mImpl->mFontDefaults->mFontDescription.slant; + } + + return TextAbstraction::FontSlant::NORMAL; } void Controller::SetDefaultPointSize( float pointSize ) @@ -293,6 +371,15 @@ void Controller::SetDefaultPointSize( float pointSize ) mImpl->mFontDefaults->mDefaultPointSize = pointSize; + unsigned int horizontalDpi( 0u ); + unsigned int verticalDpi( 0u ); + mImpl->mFontClient.GetDpi( horizontalDpi, verticalDpi ); + + // Adjust the metrics if the fixed-size font should be down-scaled + int maxEmojiSize( pointSize/POINTS_PER_INCH * verticalDpi ); + DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultPointSize %p setting MaxEmojiSize %d\n", this, maxEmojiSize ); + mImpl->mMetrics->SetMaxEmojiSize( maxEmojiSize ); + // Clear the font-specific data ClearFontData(); @@ -312,6 +399,22 @@ float Controller::GetDefaultPointSize() const return 0.0f; } +void Controller::UpdateAfterFontChange( std::string& newDefaultFont ) +{ + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange"); + + if ( !mImpl->mUserDefinedFontFamily ) // If user defined font then should not update when system font changes + { + DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str() ); + ClearFontData(); + mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; + mImpl->UpdateModel( ALL_OPERATIONS ); + mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); + mImpl->mRecalculateNaturalSize = true; + mImpl->RequestRelayout(); + } +} + void Controller::SetTextColor( const Vector4& textColor ) { mImpl->mTextColor = textColor; @@ -336,7 +439,7 @@ bool Controller::RemoveText( int cursorOffset, int numberOfChars ) DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfChars %d\n", this, mImpl->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfChars ); - if( ! mImpl->IsShowingPlaceholderText() ) + if( !mImpl->IsShowingPlaceholderText() ) { // Delete at current cursor position Vector& currentText = mImpl->mLogicalModel->mText; @@ -564,7 +667,7 @@ float Controller::GetHeightForWidth( float width ) ProcessModifyEvents(); Size layoutSize; - if( width != mImpl->mControlSize.width ) + if( width != mImpl->mVisualModel->mControlSize.width ) { // Operations that can be done only once until the text changes. const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | @@ -621,9 +724,11 @@ bool Controller::Relayout( const Size& size ) return glyphsRemoved; } - if( size != mImpl->mControlSize ) + const bool newSize = ( size != mImpl->mVisualModel->mControlSize ); + + if( newSize ) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mControlSize.width, mImpl->mControlSize.height ); + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mVisualModel->mControlSize.width, mImpl->mVisualModel->mControlSize.height ); // Operations that need to be done if the size changes. mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | @@ -632,7 +737,7 @@ bool Controller::Relayout( const Size& size ) UPDATE_ACTUAL_SIZE | REORDER ); - mImpl->mControlSize = size; + mImpl->mVisualModel->mControlSize = size; } // Make sure the model is up-to-date before layouting @@ -640,18 +745,34 @@ bool Controller::Relayout( const Size& size ) mImpl->UpdateModel( mImpl->mOperationsPending ); Size layoutSize; - bool updated = DoRelayout( mImpl->mControlSize, + bool updated = DoRelayout( mImpl->mVisualModel->mControlSize, mImpl->mOperationsPending, layoutSize ); // Do not re-do any operation until something changes. mImpl->mOperationsPending = NO_OPERATION; + // Keep the current offset and alignment as it will be used to update the decorator's positions (if the size changes). + Vector2 offset; + if( newSize && mImpl->mEventData ) + { + offset = mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition; + } + // After doing the text layout, the alignment offset to place the actor in the desired position can be calculated. CalculateTextAlignment( size ); if( mImpl->mEventData ) { + if( newSize ) + { + // If there is a new size, the scroll position needs to be clamped. + mImpl->ClampHorizontalScroll( layoutSize ); + + // Update the decorator's positions is needed if there is a new size. + mImpl->mEventData->mDecorator->UpdatePositions( mImpl->mAlignmentOffset + mImpl->mEventData->mScrollPosition - offset ); + } + // Move the cursor, grab handle etc. updated = mImpl->ProcessInputEvents() || updated; } @@ -666,18 +787,18 @@ void Controller::ProcessModifyEvents() for( unsigned int i=0; iIsShowingPlaceholderText() ) @@ -687,6 +808,13 @@ void Controller::ProcessModifyEvents() } } + if( mImpl->mEventData && + 0 != events.size() ) + { + // When the text is being modified, delay cursor blinking + mImpl->mEventData->mDecorator->DelayCursorBlink(); + } + // Discard temporary text events.clear(); } @@ -715,8 +843,9 @@ void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) mImpl->mEventData->mPrimaryCursorPosition = cursorIndex; // Update the cursor if it's in editing mode. - if( ( EventData::EDITING == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) ) + if( ( EventData::EDITING == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) ) { mImpl->mEventData->mUpdateCursorPosition = true; } @@ -769,8 +898,13 @@ void Controller::TextInsertedEvent() REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; + if( ( EventData::EDITING == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || + ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) ) + { + mImpl->mEventData->mUpdateCursorPosition = true; + mImpl->mEventData->mScrollAfterUpdatePosition = true; + } } void Controller::TextDeletedEvent() @@ -792,7 +926,11 @@ void Controller::TextDeletedEvent() REORDER ); // Queue a cursor reposition event; this must wait until after DoRelayout() - mImpl->mEventData->mScrollAfterDelete = true; + mImpl->mEventData->mUpdateCursorPosition = true; + if( 0u != mImpl->mLogicalModel->mText.Count() ) + { + mImpl->mEventData->mScrollAfterDelete = true; + } } bool Controller::DoRelayout( const Size& size, @@ -811,7 +949,7 @@ bool Controller::DoRelayout( const Size& size, // after the first time the text has been laid out. // Fill the vectors again. - Length numberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); + const Length numberOfGlyphs = mImpl->mVisualModel->mGlyphs.Count(); if( 0u == numberOfGlyphs ) { @@ -820,16 +958,17 @@ bool Controller::DoRelayout( const Size& size, return true; } - Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; - Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; - Vector& characterDirection = mImpl->mLogicalModel->mCharacterDirections; - Vector& glyphs = mImpl->mVisualModel->mGlyphs; - Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; - Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; + const Vector& lineBreakInfo = mImpl->mLogicalModel->mLineBreakInfo; + const Vector& wordBreakInfo = mImpl->mLogicalModel->mWordBreakInfo; + const Vector& characterDirection = mImpl->mLogicalModel->mCharacterDirections; + const Vector& glyphs = mImpl->mVisualModel->mGlyphs; + const Vector& glyphsToCharactersMap = mImpl->mVisualModel->mGlyphsToCharacters; + const Vector& charactersPerGlyph = mImpl->mVisualModel->mCharactersPerGlyph; + const Character* const textBuffer = mImpl->mLogicalModel->mText.Begin(); // Set the layout parameters. LayoutParameters layoutParameters( size, - mImpl->mLogicalModel->mText.Begin(), + textBuffer, lineBreakInfo.Begin(), wordBreakInfo.Begin(), ( 0u != characterDirection.Count() ) ? characterDirection.Begin() : NULL, @@ -854,6 +993,9 @@ bool Controller::DoRelayout( const Size& size, Vector& glyphPositions = mImpl->mVisualModel->mGlyphPositions; glyphPositions.Resize( numberOfGlyphs ); + // Whether the last character is a new paragraph character. + layoutParameters.isLastNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mLogicalModel->mText.Count() - 1u ) ) ); + // Update the visual model. viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, glyphPositions, @@ -991,16 +1133,7 @@ void Controller::SetVerticalAlignment( LayoutEngine::VerticalAlignment alignment // Set the alignment. mImpl->mLayoutEngine.SetVerticalAlignment( alignment ); - // Set the flag to redo the alignment operation. - // TODO : Is not needed re-layout and reorder again but with the current implementation it is. - // Im working on a different patch to fix an issue with the alignment. When that patch - // is in, this issue can be fixed. - const OperationsMask layoutOperations = static_cast( LAYOUT | - UPDATE_ACTUAL_SIZE | - ALIGN | - REORDER ); - - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); mImpl->RequestRelayout(); } @@ -1016,7 +1149,12 @@ void Controller::CalculateTextAlignment( const Size& size ) // Get the direction of the first character. const CharacterDirection firstParagraphDirection = mImpl->mLogicalModel->GetCharacterDirection( 0u ); - const Size& actualSize = mImpl->mVisualModel->GetActualSize(); + Size actualSize = mImpl->mVisualModel->GetActualSize(); + if( fabsf( actualSize.height ) < Math::MACHINE_EPSILON_1000 ) + { + // Get the line height of the default font. + actualSize.height = mImpl->GetDefaultFontLineHeight(); + } // If the first paragraph is right to left swap ALIGN_BEGIN and ALIGN_END; LayoutEngine::HorizontalAlignment horizontalAlignment = mImpl->mLayoutEngine.GetHorizontalAlignment(); @@ -1042,8 +1180,7 @@ void Controller::CalculateTextAlignment( const Size& size ) } case LayoutEngine::HORIZONTAL_ALIGN_CENTER: { - const int intOffset = static_cast( 0.5f * ( size.width - actualSize.width ) ); // try to avoid pixel alignment. - mImpl->mAlignmentOffset.x = static_cast( intOffset ); + mImpl->mAlignmentOffset.x = floorf( 0.5f * ( size.width - actualSize.width ) ); // try to avoid pixel alignment. break; } case LayoutEngine::HORIZONTAL_ALIGN_END: @@ -1063,8 +1200,7 @@ void Controller::CalculateTextAlignment( const Size& size ) } case LayoutEngine::VERTICAL_ALIGN_CENTER: { - const int intOffset = static_cast( 0.5f * ( size.height - actualSize.height ) ); // try to avoid pixel alignment. - mImpl->mAlignmentOffset.y = static_cast( intOffset ); + mImpl->mAlignmentOffset.y = floorf( 0.5f * ( size.height - actualSize.height ) ); // try to avoid pixel alignment. break; } case LayoutEngine::VERTICAL_ALIGN_BOTTOM: @@ -1091,7 +1227,12 @@ void Controller::KeyboardFocusGainEvent() if( mImpl->mEventData ) { - mImpl->ChangeState( EventData::EDITING ); + if( ( EventData::INACTIVE == mImpl->mEventData->mState ) || + ( EventData::INTERRUPTED == mImpl->mEventData->mState ) ) + { + mImpl->ChangeState( EventData::EDITING ); + mImpl->mEventData->mUpdateCursorPosition = true; //If editing started without tap event, cursor update must be triggered. + } if( mImpl->IsShowingPlaceholderText() ) { @@ -1113,7 +1254,7 @@ void Controller::KeyboardFocusLostEvent() { mImpl->ChangeState( EventData::INACTIVE ); - if( mImpl->IsShowingPlaceholderText() ) + if( !mImpl->IsShowingRealText() ) { // Revert to regular placeholder-text when not editing ShowPlaceholderText(); @@ -1166,6 +1307,13 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) // Menu/Home key behaviour does not allow edit mode to resume like Power key // Avoids calling the InsertText() method which can delete selected text } + else if( Dali::DALI_KEY_SHIFT_LEFT == keyCode ) + { + // DALI_KEY_SHIFT_LEFT is the key code for the Left Shift. It's sent (by the imf?) when the predictive text is enabled + // and a character is typed after the type of a upper case latin character. + + // Do nothing. + } else { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() ); @@ -1177,7 +1325,8 @@ bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) textChanged = true; } - if ( mImpl->mEventData->mState != EventData::INTERRUPTED && mImpl->mEventData->mState != EventData::INACTIVE ) + if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && + ( mImpl->mEventData->mState != EventData::INACTIVE ) ) { mImpl->ChangeState( EventData::EDITING ); } @@ -1204,6 +1353,9 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); + // TODO: At the moment the underline runs are only for pre-edit. + mImpl->mVisualModel->mUnderlineRuns.Clear(); + Vector utf32Characters; Length characterCount( 0u ); @@ -1213,6 +1365,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ 0 != mImpl->mEventData->mPreEditLength ) { CharacterIndex offset = mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition; + removedPrevious = RemoveText( -static_cast(offset), mImpl->mEventData->mPreEditLength ); mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; @@ -1224,7 +1377,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ removedPrevious = RemoveSelectedText(); } - if( ! text.empty() ) + if( !text.empty() ) { // Convert text into UTF-32 utf32Characters.Resize( text.size() ); @@ -1261,7 +1414,7 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ } else // PRE_EDIT { - if( ! mImpl->mEventData->mPreEditFlag ) + if( !mImpl->mEventData->mPreEditFlag ) { DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state" ); @@ -1331,8 +1484,7 @@ bool Controller::RemoveSelectedText() { bool textRemoved( false ); - if ( EventData::SELECTING == mImpl->mEventData->mState || - EventData::SELECTION_CHANGED == mImpl->mEventData->mState ) + if( EventData::SELECTING == mImpl->mEventData->mState ) { std::string removedString; mImpl->RetrieveSelection( removedString, true ); @@ -1353,21 +1505,39 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) if( NULL != mImpl->mEventData ) { - const bool isShowingPlaceholderText = mImpl->IsShowingPlaceholderText(); if( 1u == tapCount ) { - if( !isShowingPlaceholderText && - ( EventData::EDITING == mImpl->mEventData->mState ) ) + // This is to avoid unnecessary relayouts when tapping an empty text-field + bool relayoutNeeded( false ); + + if( mImpl->IsShowingRealText() && + EventData::EDITING == mImpl->mEventData->mState ) { - mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, true ); - mImpl->mEventData->mDecorator->SetPopupActive( false ); + // Show grab handle on second tap + mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); + relayoutNeeded = true; } - - // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated - if( mImpl->mEventData ) + else if( EventData::EDITING != mImpl->mEventData->mState && + EventData::EDITING_WITH_GRAB_HANDLE != mImpl->mEventData->mState ) { + if( mImpl->IsShowingPlaceholderText() && ! mImpl->IsFocusedPlaceholderAvailable() ) + { + // Hide placeholder text + ResetText(); + } + // Show cursor on first tap mImpl->ChangeState( EventData::EDITING ); + relayoutNeeded = true; + } + else if( mImpl->IsShowingRealText() ) + { + // Move the cursor + relayoutNeeded = true; + } + // Handles & cursors must be repositioned after Relayout() i.e. after the Model has been updated + if( relayoutNeeded ) + { Event event( Event::TAP_EVENT ); event.p1.mUint = tapCount; event.p2.mFloat = x; @@ -1377,11 +1547,13 @@ void Controller::TapEvent( unsigned int tapCount, float x, float y ) mImpl->RequestRelayout(); } } - else if( !isShowingPlaceholderText && - mImpl->mEventData->mSelectionEnabled && - ( 2u == tapCount ) ) + else if( 2u == tapCount ) { - SelectEvent( x, y, false ); + if( mImpl->mEventData->mSelectionEnabled && + mImpl->IsShowingRealText() ) + { + SelectEvent( x, y, false ); + } } } @@ -1407,21 +1579,41 @@ void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) void Controller::LongPressEvent( Gesture::State state, float x, float y ) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); + DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" ); - if ( mImpl->IsShowingPlaceholderText() || mImpl->mLogicalModel->mText.Count() == 0u ) + if( state == Gesture::Started && + mImpl->mEventData ) { - if ( mImpl->mEventData ) + if( ! mImpl->IsShowingRealText() ) { Event event( Event::LONG_PRESS_EVENT ); event.p1.mInt = state; mImpl->mEventData->mEventQueue.push_back( event ); mImpl->RequestRelayout(); } - } - else if( mImpl->mEventData ) - { - SelectEvent( x, y, false ); + else + { + // The 1st long-press on inactive text-field is treated as tap + if( EventData::INACTIVE == mImpl->mEventData->mState ) + { + mImpl->ChangeState( EventData::EDITING ); + + Event event( Event::TAP_EVENT ); + event.p1.mUint = 1; + event.p2.mFloat = x; + event.p3.mFloat = y; + mImpl->mEventData->mEventQueue.push_back( event ); + + mImpl->RequestRelayout(); + } + else + { + // Reset the imf manger to commit the pre-edit before selecting the text. + mImpl->ResetImfManager(); + + SelectEvent( x, y, false ); + } + } } } @@ -1429,14 +1621,7 @@ void Controller::SelectEvent( float x, float y, bool selectAll ) { if( mImpl->mEventData ) { - if ( mImpl->mEventData->mState == EventData::SELECTING ) - { - mImpl->ChangeState( EventData::SELECTION_CHANGED ); - } - else - { - mImpl->ChangeState( EventData::SELECTING ); - } + mImpl->ChangeState( EventData::SELECTING ); if( selectAll ) { @@ -1457,7 +1642,7 @@ void Controller::SelectEvent( float x, float y, bool selectAll ) void Controller::GetTargetSize( Vector2& targetSize ) { - targetSize = mImpl->mControlSize; + targetSize = mImpl->mVisualModel->mControlSize; } void Controller::AddDecoration( Actor& actor, bool needsClipping ) @@ -1503,6 +1688,12 @@ void Controller::DecorationEvent( HandleType handleType, HandleState state, floa mImpl->mEventData->mEventQueue.push_back( event ); break; } + case LEFT_SELECTION_HANDLE_MARKER: + case RIGHT_SELECTION_HANDLE_MARKER: + { + // Markers do not move the handles. + break; + } case HANDLE_TYPE_COUNT: { DALI_ASSERT_DEBUG( !"Controller::HandleEvent. Unexpected handle type" ); @@ -1518,12 +1709,21 @@ void Controller::PasteText( const std::string& stringToPaste ) InsertText( stringToPaste, Text::Controller::COMMIT ); mImpl->ChangeState( EventData::EDITING ); mImpl->RequestRelayout(); + + // Do this last since it provides callbacks into application code + mImpl->mControlInterface.TextChanged(); } void Controller::PasteClipboardItemEvent() { + // Retrieve the clipboard contents first ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); std::string stringToPaste( notifier.GetContent() ); + + // Commit the current pre-edit text; the contents of the clipboard should be appended + mImpl->ResetImfManager(); + + // Paste PasteText( stringToPaste ); } @@ -1540,6 +1740,13 @@ void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Butt { mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text mImpl->mOperationsPending = ALL_OPERATIONS; + + // This is to reset the virtual keyboard to Upper-case + if( 0u == mImpl->mLogicalModel->mText.Count() ) + { + NotifyImfManager(); + } + if( 0u != mImpl->mLogicalModel->mText.Count() || !mImpl->IsPlaceholderAvailable() ) { @@ -1610,6 +1817,7 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons case ImfManager::COMMIT: { InsertText( imfEvent.predictiveString, Text::Controller::COMMIT ); + update=true; requestRelayout = true; break; } @@ -1622,7 +1830,21 @@ ImfManager::ImfCallbackData Controller::OnImfEvent( ImfManager& imfManager, cons } case ImfManager::DELETESURROUNDING: { - RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars ); + update = RemoveText( imfEvent.cursorOffset, imfEvent.numberOfChars ); + + if( update ) + { + if( 0u != mImpl->mLogicalModel->mText.Count() || + !mImpl->IsPlaceholderAvailable() ) + { + mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); + } + else + { + ShowPlaceholderText(); + mImpl->mEventData->mUpdateCursorPosition = true; + } + } requestRelayout = true; break; } @@ -1676,8 +1898,7 @@ bool Controller::BackspaceKeyEvent() bool removed( false ); - if ( EventData::SELECTING == mImpl->mEventData->mState || - EventData::SELECTION_CHANGED == mImpl->mEventData->mState ) + if( EventData::SELECTING == mImpl->mEventData->mState ) { removed = RemoveSelectedText(); } @@ -1689,6 +1910,11 @@ bool Controller::BackspaceKeyEvent() if( removed ) { + DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p DALI_KEY_BACKSPACE RemovedText\n", this ); + // Notifiy the IMF manager after text changed + // Automatic Upper-case and restarting prediction on an existing word require this. + NotifyImfManager(); + if( 0u != mImpl->mLogicalModel->mText.Count() || !mImpl->IsPlaceholderAvailable() ) { @@ -1704,6 +1930,25 @@ bool Controller::BackspaceKeyEvent() return removed; } +void Controller::NotifyImfManager() +{ + if( mImpl->mEventData ) + { + ImfManager imfManager = ImfManager::Get(); + + if( imfManager ) + { + // Notifying IMF of a cursor change triggers a surrounding text request so updating it now. + std::string text; + GetText( text ); + imfManager.SetSurroundingText( text ); + + imfManager.SetCursorPosition( GetLogicalCursorPosition() ); + imfManager.NotifyCursorPosition(); + } + } +} + void Controller::ShowPlaceholderText() { if( mImpl->IsPlaceholderAvailable() )