X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.cpp;h=670c6d9326d1a3ccc8166d86a3f306d4d1d59745;hb=fe3e58378dc1c4ef9c14cac9592e99adbcd198f1;hp=cb09223347e12563d7ffadf634fedc895df9b370;hpb=8c98262c52c72d5767c4552bb3c294a1565aefaa;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.cpp b/dali-toolkit/internal/text/text-controller.cpp old mode 100755 new mode 100644 index cb09223..670c6d9 --- a/dali-toolkit/internal/text/text-controller.cpp +++ b/dali-toolkit/internal/text/text-controller.cpp @@ -1,5 +1,5 @@ /* - * Copyright (c) 2019 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 Samsung Electronics Co., Ltd. * * Licensed under the Apache License, Version 2.0 (the "License"); * you may not use this file except in compliance with the License. @@ -19,139 +19,82 @@ #include // EXTERNAL INCLUDES -#include -#include -#include -#include #include -#include -#include -#include +#include +#include +#include +#include // INTERNAL INCLUDES -#include -#include #include #include #include -#include +#include #include +#include +#include #include -#include namespace { - #if defined(DEBUG_ENABLED) - Debug::Filter* gLogFilter = Debug::Filter::New(Debug::NoLogging, 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 std::string EMPTY_STRING(""); -const std::string KEY_C_NAME = "c"; -const std::string KEY_V_NAME = "v"; -const std::string KEY_X_NAME = "x"; - -const char * const PLACEHOLDER_TEXT = "text"; -const char * const PLACEHOLDER_TEXT_FOCUSED = "textFocused"; -const char * const PLACEHOLDER_COLOR = "color"; -const char * const PLACEHOLDER_FONT_FAMILY = "fontFamily"; -const char * const PLACEHOLDER_FONT_STYLE = "fontStyle"; -const char * const PLACEHOLDER_POINT_SIZE = "pointSize"; -const char * const PLACEHOLDER_PIXEL_SIZE = "pixelSize"; -const char * const PLACEHOLDER_ELLIPSIS = "ellipsis"; - -float ConvertToEven( float value ) +float ConvertToEven(float value) { - int intValue(static_cast( value )); - return static_cast( intValue + ( intValue & 1 ) ); + int intValue(static_cast(value)); + return static_cast(intValue + (intValue & 1)); } -int ConvertPixelToPint( float pixel ) +int ConvertPixelToPint(float pixel) { - unsigned int horizontalDpi = 0u; - unsigned int verticalDpi = 0u; - Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get(); - fontClient.GetDpi( horizontalDpi, verticalDpi ); + unsigned int horizontalDpi = 0u; + unsigned int verticalDpi = 0u; + Dali::TextAbstraction::FontClient fontClient = Dali::TextAbstraction::FontClient::Get(); + fontClient.GetDpi(horizontalDpi, verticalDpi); - return ( pixel * 72.f ) / static_cast< float >( horizontalDpi ); + return (pixel * 72.f) / static_cast(horizontalDpi); } } // namespace namespace Dali { - namespace Toolkit { - namespace Text { - -/** - * @brief Adds a new font description run for the selected text. - * - * The new font parameters are added after the call to this method. - * - * @param[in] eventData The event data pointer. - * @param[in] logicalModel The logical model where to add the new font description run. - * @param[out] startOfSelectedText Index to the first selected character. - * @param[out] lengthOfSelectedText Number of selected characters. - */ -FontDescriptionRun& UpdateSelectionFontStyleRun( EventData* eventData, - LogicalModelPtr logicalModel, - CharacterIndex& startOfSelectedText, - Length& lengthOfSelectedText ) -{ - const bool handlesCrossed = eventData->mLeftSelectionPosition > eventData->mRightSelectionPosition; - - // Get start and end position of selection - startOfSelectedText = handlesCrossed ? eventData->mRightSelectionPosition : eventData->mLeftSelectionPosition; - lengthOfSelectedText = ( handlesCrossed ? eventData->mLeftSelectionPosition : eventData->mRightSelectionPosition ) - startOfSelectedText; - - // Add the font run. - const VectorBase::SizeType numberOfRuns = logicalModel->mFontDescriptionRuns.Count(); - logicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); - - FontDescriptionRun& fontDescriptionRun = *( logicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); - - fontDescriptionRun.characterRun.characterIndex = startOfSelectedText; - fontDescriptionRun.characterRun.numberOfCharacters = lengthOfSelectedText; - - // Recalculate the selection highlight as the metrics may have changed. - eventData->mUpdateLeftSelectionPosition = true; - eventData->mUpdateRightSelectionPosition = true; - eventData->mUpdateHighlightBox = true; - - return fontDescriptionRun; -} - // public : Constructor. ControllerPtr Controller::New() { - return ControllerPtr( new Controller() ); + return ControllerPtr(new Controller()); } -ControllerPtr Controller::New( ControlInterface* controlInterface ) +ControllerPtr Controller::New(ControlInterface* controlInterface) { - return ControllerPtr( new Controller( controlInterface ) ); + return ControllerPtr(new Controller(controlInterface)); } -ControllerPtr Controller::New( ControlInterface* controlInterface, - EditableControlInterface* editableControlInterface ) +ControllerPtr Controller::New(ControlInterface* controlInterface, + EditableControlInterface* editableControlInterface, + SelectableControlInterface* selectableControlInterface) { - return ControllerPtr( new Controller( controlInterface, - editableControlInterface ) ); + return ControllerPtr(new Controller(controlInterface, + editableControlInterface, + selectableControlInterface)); } // public : Configure the text controller. -void Controller::EnableTextInput( DecoratorPtr decorator, InputMethodContext& inputMethodContext ) +void Controller::EnableTextInput(DecoratorPtr decorator, InputMethodContext& inputMethodContext) { - if( !decorator ) + if(!decorator) { delete mImpl->mEventData; mImpl->mEventData = NULL; @@ -160,16 +103,16 @@ void Controller::EnableTextInput( DecoratorPtr decorator, InputMethodContext& in return; } - if( NULL == mImpl->mEventData ) + if(NULL == mImpl->mEventData) { - mImpl->mEventData = new EventData( decorator, inputMethodContext ); + mImpl->mEventData = new EventData(decorator, inputMethodContext); } } -void Controller::SetGlyphType( TextAbstraction::GlyphType glyphType ) +void Controller::SetGlyphType(TextAbstraction::GlyphType glyphType) { // Metrics for bitmap & vector based glyphs are different - mImpl->mMetrics->SetGlyphType( glyphType ); + mImpl->mMetrics->SetGlyphType(glyphType); // Clear the font-specific data ClearFontData(); @@ -177,15 +120,15 @@ void Controller::SetGlyphType( TextAbstraction::GlyphType glyphType ) mImpl->RequestRelayout(); } -void Controller::SetMarkupProcessorEnabled( bool enable ) +void Controller::SetMarkupProcessorEnabled(bool enable) { - if( enable != mImpl->mMarkupProcessorEnabled ) + if(enable != mImpl->mMarkupProcessorEnabled) { //If Text was already set, call the SetText again for enabling or disabling markup mImpl->mMarkupProcessorEnabled = enable; std::string text; - GetText( text ); - SetText( text ); + GetText(text); + SetText(text); } } @@ -194,31 +137,30 @@ bool Controller::IsMarkupProcessorEnabled() const return mImpl->mMarkupProcessorEnabled; } -void Controller::SetAutoScrollEnabled( bool enable ) +void Controller::SetAutoScrollEnabled(bool enable) { - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable)?"true":"false", ( mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX)?"true":"false", this ); + DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled[%s] SingleBox[%s]-> [%p]\n", (enable) ? "true" : "false", (mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX) ? "true" : "false", this); - if( mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX ) + if(mImpl->mLayoutEngine.GetLayout() == Layout::Engine::SINGLE_LINE_BOX) { - if( enable ) + if(enable) { - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n" ); - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - LAYOUT | - ALIGN | - UPDATE_LAYOUT_SIZE | - UPDATE_DIRECTION | - REORDER ); - + DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled for SINGLE_LINE_BOX\n"); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_LAYOUT_SIZE | + UPDATE_DIRECTION | + REORDER); } else { - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled Disabling autoscroll\n"); - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - LAYOUT | - ALIGN | - UPDATE_LAYOUT_SIZE | - REORDER ); + DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetAutoScrollEnabled Disabling autoscroll\n"); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_LAYOUT_SIZE | + REORDER); } mImpl->mIsAutoScrollEnabled = enable; @@ -226,14 +168,14 @@ void Controller::SetAutoScrollEnabled( bool enable ) } else { - DALI_LOG_WARNING( "Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored\n" ); + DALI_LOG_WARNING("Attempted AutoScrolling on a non SINGLE_LINE_BOX, request ignored\n"); mImpl->mIsAutoScrollEnabled = false; } } bool Controller::IsAutoScrollEnabled() const { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", mImpl->mIsAutoScrollEnabled?"true":"false" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::IsAutoScrollEnabled[%s]\n", mImpl->mIsAutoScrollEnabled ? "true" : "false"); return mImpl->mIsAutoScrollEnabled; } @@ -247,27 +189,27 @@ float Controller::GetAutoScrollLineAlignment() const { float offset = 0.f; - if( mImpl->mModel->mVisualModel && - ( 0u != mImpl->mModel->mVisualModel->mLines.Count() ) ) + if(mImpl->mModel->mVisualModel && + (0u != mImpl->mModel->mVisualModel->mLines.Count())) { - offset = ( *mImpl->mModel->mVisualModel->mLines.Begin() ).alignmentOffset; + offset = (*mImpl->mModel->mVisualModel->mLines.Begin()).alignmentOffset; } return offset; } -void Controller::SetHorizontalScrollEnabled( bool enable ) +void Controller::SetHorizontalScrollEnabled(bool enable) { - if( ( NULL != mImpl->mEventData ) && - mImpl->mEventData->mDecorator ) + if((NULL != mImpl->mEventData) && + mImpl->mEventData->mDecorator) { - mImpl->mEventData->mDecorator->SetHorizontalScrollEnabled( enable ); + mImpl->mEventData->mDecorator->SetHorizontalScrollEnabled(enable); } } bool Controller::IsHorizontalScrollEnabled() const { - if( ( NULL != mImpl->mEventData ) && - mImpl->mEventData->mDecorator ) + if((NULL != mImpl->mEventData) && + mImpl->mEventData->mDecorator) { return mImpl->mEventData->mDecorator->IsHorizontalScrollEnabled(); } @@ -275,22 +217,22 @@ bool Controller::IsHorizontalScrollEnabled() const return false; } -void Controller::SetVerticalScrollEnabled( bool enable ) +void Controller::SetVerticalScrollEnabled(bool enable) { - if( ( NULL != mImpl->mEventData ) && - mImpl->mEventData->mDecorator ) + if((NULL != mImpl->mEventData) && + mImpl->mEventData->mDecorator) { - if( mImpl->mEventData->mDecorator ) + if(mImpl->mEventData->mDecorator) { - mImpl->mEventData->mDecorator->SetVerticalScrollEnabled( enable ); + mImpl->mEventData->mDecorator->SetVerticalScrollEnabled(enable); } } } bool Controller::IsVerticalScrollEnabled() const { - if( ( NULL != mImpl->mEventData ) && - mImpl->mEventData->mDecorator ) + if((NULL != mImpl->mEventData) && + mImpl->mEventData->mDecorator) { return mImpl->mEventData->mDecorator->IsVerticalScrollEnabled(); } @@ -298,19 +240,19 @@ bool Controller::IsVerticalScrollEnabled() const return false; } -void Controller::SetSmoothHandlePanEnabled( bool enable ) +void Controller::SetSmoothHandlePanEnabled(bool enable) { - if( ( NULL != mImpl->mEventData ) && - mImpl->mEventData->mDecorator ) + if((NULL != mImpl->mEventData) && + mImpl->mEventData->mDecorator) { - mImpl->mEventData->mDecorator->SetSmoothHandlePanEnabled( enable ); + mImpl->mEventData->mDecorator->SetSmoothHandlePanEnabled(enable); } } bool Controller::IsSmoothHandlePanEnabled() const { - if( ( NULL != mImpl->mEventData ) && - mImpl->mEventData->mDecorator ) + if((NULL != mImpl->mEventData) && + mImpl->mEventData->mDecorator) { return mImpl->mEventData->mDecorator->IsSmoothHandlePanEnabled(); } @@ -318,7 +260,7 @@ bool Controller::IsSmoothHandlePanEnabled() const return false; } -void Controller::SetMaximumNumberOfCharacters( Length maxCharacters ) +void Controller::SetMaximumNumberOfCharacters(Length maxCharacters) { mImpl->mMaximumNumberOfCharacters = maxCharacters; } @@ -328,16 +270,16 @@ int Controller::GetMaximumNumberOfCharacters() return mImpl->mMaximumNumberOfCharacters; } -void Controller::SetEnableCursorBlink( bool enable ) +void Controller::SetEnableCursorBlink(bool enable) { - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "TextInput disabled" ); + DALI_ASSERT_DEBUG(NULL != mImpl->mEventData && "TextInput disabled"); - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mCursorBlinkEnabled = enable; - if( !enable && - mImpl->mEventData->mDecorator ) + if(!enable && + mImpl->mEventData->mDecorator) { mImpl->mEventData->mDecorator->StopCursorBlink(); } @@ -346,7 +288,7 @@ void Controller::SetEnableCursorBlink( bool enable ) bool Controller::GetEnableCursorBlink() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mCursorBlinkEnabled; } @@ -354,23 +296,23 @@ bool Controller::GetEnableCursorBlink() const return false; } -void Controller::SetMultiLineEnabled( bool enable ) +void Controller::SetMultiLineEnabled(bool enable) { const Layout::Engine::Type layout = enable ? Layout::Engine::MULTI_LINE_BOX : Layout::Engine::SINGLE_LINE_BOX; - if( layout != mImpl->mLayoutEngine.GetLayout() ) + if(layout != mImpl->mLayoutEngine.GetLayout()) { // Set the layout type. - mImpl->mLayoutEngine.SetLayout( layout ); + mImpl->mLayoutEngine.SetLayout(layout); // Set the flags to redo the layout operations - const OperationsMask layoutOperations = static_cast( LAYOUT | - UPDATE_LAYOUT_SIZE | - ALIGN | - REORDER ); + const OperationsMask layoutOperations = static_cast(LAYOUT | + UPDATE_LAYOUT_SIZE | + ALIGN | + REORDER); mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | layoutOperations ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | layoutOperations); // Need to recalculate natural size mImpl->mRecalculateNaturalSize = true; @@ -384,24 +326,24 @@ bool Controller::IsMultiLineEnabled() const return Layout::Engine::MULTI_LINE_BOX == mImpl->mLayoutEngine.GetLayout(); } -void Controller::SetHorizontalAlignment( Text::HorizontalAlignment::Type alignment ) +void Controller::SetHorizontalAlignment(Text::HorizontalAlignment::Type alignment) { - if( alignment != mImpl->mModel->mHorizontalAlignment ) + if(alignment != mImpl->mModel->mHorizontalAlignment) { // Set the alignment. mImpl->mModel->mHorizontalAlignment = alignment; // Set the flag to redo the alignment operation. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | ALIGN); - if( mImpl->mEventData ) + if(mImpl->mEventData) { mImpl->mEventData->mUpdateAlignment = true; // Update the cursor if it's in editing mode - if( EventData::IsEditingState( mImpl->mEventData->mState ) ) + if(EventData::IsEditingState(mImpl->mEventData->mState)) { - mImpl->ChangeState( EventData::EDITING ); + mImpl->ChangeState(EventData::EDITING); mImpl->mEventData->mUpdateCursorPosition = true; } } @@ -415,14 +357,14 @@ Text::HorizontalAlignment::Type Controller::GetHorizontalAlignment() const return mImpl->mModel->mHorizontalAlignment; } -void Controller::SetVerticalAlignment( VerticalAlignment::Type alignment ) +void Controller::SetVerticalAlignment(VerticalAlignment::Type alignment) { - if( alignment != mImpl->mModel->mVerticalAlignment ) + if(alignment != mImpl->mModel->mVerticalAlignment) { // Set the alignment. mImpl->mModel->mVerticalAlignment = alignment; - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | ALIGN ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | ALIGN); mImpl->RequestRelayout(); } @@ -438,7 +380,7 @@ bool Controller::IsIgnoreSpacesAfterText() const return mImpl->mModel->mIgnoreSpacesAfterText; } -void Controller::SetIgnoreSpacesAfterText( bool ignore ) +void Controller::SetIgnoreSpacesAfterText(bool ignore) { mImpl->mModel->mIgnoreSpacesAfterText = ignore; } @@ -448,12 +390,12 @@ bool Controller::IsMatchSystemLanguageDirection() const return mImpl->mModel->mMatchSystemLanguageDirection; } -void Controller::SetMatchSystemLanguageDirection( bool match ) +void Controller::SetMatchSystemLanguageDirection(bool match) { mImpl->mModel->mMatchSystemLanguageDirection = match; } -void Controller::SetLayoutDirection( Dali::LayoutDirection::Type layoutDirection ) +void Controller::SetLayoutDirection(Dali::LayoutDirection::Type layoutDirection) { mImpl->mLayoutDirection = layoutDirection; } @@ -463,24 +405,22 @@ bool Controller::IsShowingRealText() const return mImpl->IsShowingRealText(); } - -void Controller::SetLineWrapMode( Text::LineWrap::Mode lineWrapMode ) +void Controller::SetLineWrapMode(Text::LineWrap::Mode lineWrapMode) { - if( lineWrapMode != mImpl->mModel->mLineWrapMode ) + if(lineWrapMode != mImpl->mModel->mLineWrapMode) { // Set the text wrap mode. mImpl->mModel->mLineWrapMode = lineWrapMode; - // Update Text layout for applying wrap mode - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - ALIGN | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER ); - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + ALIGN | + LAYOUT | + UPDATE_LAYOUT_SIZE | + REORDER); + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); // Request relayout mImpl->RequestRelayout(); @@ -492,7 +432,7 @@ Text::LineWrap::Mode Controller::GetLineWrapMode() const return mImpl->mModel->mLineWrapMode; } -void Controller::SetTextElideEnabled( bool enabled ) +void Controller::SetTextElideEnabled(bool enabled) { mImpl->mModel->mElideEnabled = enabled; } @@ -512,9 +452,9 @@ bool Controller::IsTextFitEnabled() const return mImpl->mTextFitEnabled; } -void Controller::SetTextFitMinSize( float minSize, FontSizeType type ) +void Controller::SetTextFitMinSize(float minSize, FontSizeType type) { - switch( type ) + switch(type) { case POINT_SIZE: { @@ -523,7 +463,7 @@ void Controller::SetTextFitMinSize( float minSize, FontSizeType type ) } case PIXEL_SIZE: { - mImpl->mTextFitMinSize = ConvertPixelToPint( minSize ); + mImpl->mTextFitMinSize = ConvertPixelToPint(minSize); break; } } @@ -534,9 +474,9 @@ float Controller::GetTextFitMinSize() const return mImpl->mTextFitMinSize; } -void Controller::SetTextFitMaxSize( float maxSize, FontSizeType type ) +void Controller::SetTextFitMaxSize(float maxSize, FontSizeType type) { - switch( type ) + switch(type) { case POINT_SIZE: { @@ -545,7 +485,7 @@ void Controller::SetTextFitMaxSize( float maxSize, FontSizeType type ) } case PIXEL_SIZE: { - mImpl->mTextFitMaxSize = ConvertPixelToPint( maxSize ); + mImpl->mTextFitMaxSize = ConvertPixelToPint(maxSize); break; } } @@ -556,9 +496,9 @@ float Controller::GetTextFitMaxSize() const return mImpl->mTextFitMaxSize; } -void Controller::SetTextFitStepSize( float step, FontSizeType type ) +void Controller::SetTextFitStepSize(float step, FontSizeType type) { - switch( type ) + switch(type) { case POINT_SIZE: { @@ -567,7 +507,7 @@ void Controller::SetTextFitStepSize( float step, FontSizeType type ) } case PIXEL_SIZE: { - mImpl->mTextFitStepSize = ConvertPixelToPint( step ); + mImpl->mTextFitStepSize = ConvertPixelToPint(step); break; } } @@ -588,25 +528,17 @@ Vector2 Controller::GetTextFitContentSize() const return mImpl->mTextFitContentSize; } -void Controller::SetPlaceholderTextElideEnabled( bool enabled ) +void Controller::SetPlaceholderTextElideEnabled(bool enabled) { - mImpl->mEventData->mIsPlaceholderElideEnabled = enabled; - mImpl->mEventData->mPlaceholderEllipsisFlag = true; - - // Update placeholder if there is no text - if( mImpl->IsShowingPlaceholderText() || - ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) ) - { - ShowPlaceholderText(); - } + PlaceholderHandler::SetPlaceholderTextElideEnabled(*this, enabled); } bool Controller::IsPlaceholderTextElideEnabled() const { - return mImpl->mEventData->mIsPlaceholderElideEnabled; + return PlaceholderHandler::IsPlaceholderTextElideEnabled(*this); } -void Controller::SetSelectionEnabled( bool enabled ) +void Controller::SetSelectionEnabled(bool enabled) { mImpl->mEventData->mSelectionEnabled = enabled; } @@ -616,7 +548,7 @@ bool Controller::IsSelectionEnabled() const return mImpl->mEventData->mSelectionEnabled; } -void Controller::SetShiftSelectionEnabled( bool enabled ) +void Controller::SetShiftSelectionEnabled(bool enabled) { mImpl->mEventData->mShiftSelectionFlag = enabled; } @@ -626,7 +558,7 @@ bool Controller::IsShiftSelectionEnabled() const return mImpl->mEventData->mShiftSelectionFlag; } -void Controller::SetGrabHandleEnabled( bool enabled ) +void Controller::SetGrabHandleEnabled(bool enabled) { mImpl->mEventData->mGrabHandleEnabled = enabled; } @@ -648,9 +580,9 @@ bool Controller::IsGrabHandlePopupEnabled() const // public : Update -void Controller::SetText( const std::string& text ) +void Controller::SetText(const std::string& text) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText\n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SetText\n"); // Reset keyboard as text changed mImpl->ResetInputMethodContext(); @@ -663,55 +595,55 @@ void Controller::SetText( const std::string& text ) CharacterIndex lastCursorIndex = 0u; - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { // If popup shown then hide it by switching to Editing state - if( ( EventData::SELECTING == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_POPUP == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_GRAB_HANDLE == mImpl->mEventData->mState ) || - ( EventData::EDITING_WITH_PASTE_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) || + (EventData::EDITING_WITH_PASTE_POPUP == mImpl->mEventData->mState)) { - mImpl->ChangeState( EventData::EDITING ); + mImpl->ChangeState(EventData::EDITING); } } - if( !text.empty() ) + if(!text.empty()) { - mImpl->mModel->mVisualModel->SetTextColor( mImpl->mTextColor ); + mImpl->mModel->mVisualModel->SetTextColor(mImpl->mTextColor); - MarkupProcessData markupProcessData( mImpl->mModel->mLogicalModel->mColorRuns, - mImpl->mModel->mLogicalModel->mFontDescriptionRuns, - mImpl->mModel->mLogicalModel->mEmbeddedItems ); + MarkupProcessData markupProcessData(mImpl->mModel->mLogicalModel->mColorRuns, + mImpl->mModel->mLogicalModel->mFontDescriptionRuns, + mImpl->mModel->mLogicalModel->mEmbeddedItems); - Length textSize = 0u; - const uint8_t* utf8 = NULL; - if( mImpl->mMarkupProcessorEnabled ) + Length textSize = 0u; + const uint8_t* utf8 = NULL; + if(mImpl->mMarkupProcessorEnabled) { - ProcessMarkupString( text, markupProcessData ); + ProcessMarkupString(text, markupProcessData); textSize = markupProcessData.markupProcessedText.size(); // This is a bit horrible but std::string returns a (signed) char* - utf8 = reinterpret_cast( markupProcessData.markupProcessedText.c_str() ); + utf8 = reinterpret_cast(markupProcessData.markupProcessedText.c_str()); } else { textSize = text.size(); // This is a bit horrible but std::string returns a (signed) char* - utf8 = reinterpret_cast( text.c_str() ); + utf8 = reinterpret_cast(text.c_str()); } // Convert text into UTF-32 Vector& utf32Characters = mImpl->mModel->mLogicalModel->mText; - utf32Characters.Resize( textSize ); + utf32Characters.Resize(textSize); // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - Length characterCount = Utf8ToUtf32( utf8, textSize, utf32Characters.Begin() ); - utf32Characters.Resize( characterCount ); + Length characterCount = Utf8ToUtf32(utf8, textSize, utf32Characters.Begin()); + utf32Characters.Resize(characterCount); - DALI_ASSERT_DEBUG( textSize >= characterCount && "Invalid UTF32 conversion length" ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, textSize, mImpl->mModel->mLogicalModel->mText.Count() ); + DALI_ASSERT_DEBUG(textSize >= characterCount && "Invalid UTF32 conversion length"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::SetText %p UTF8 size %d, UTF32 size %d\n", this, textSize, mImpl->mModel->mLogicalModel->mText.Count()); // The characters to be added. mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); @@ -720,7 +652,7 @@ void Controller::SetText( const std::string& text ) lastCursorIndex = characterCount; // Update the rest of the model during size negotiation - mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); + mImpl->QueueModifyEvent(ModifyEvent::TEXT_REPLACED); // The natural size needs to be re-calculated. mImpl->mRecalculateNaturalSize = true; @@ -737,83 +669,56 @@ void Controller::SetText( const std::string& text ) } // Resets the cursor position. - ResetCursorPosition( lastCursorIndex ); + ResetCursorPosition(lastCursorIndex); // Scrolls the text to make the cursor visible. ResetScrollPosition(); mImpl->RequestRelayout(); - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { // Cancel previously queued events mImpl->mEventData->mEventQueue.clear(); } // Do this last since it provides callbacks into application code. - if( NULL != mImpl->mEditableControlInterface ) + if(NULL != mImpl->mEditableControlInterface) { - mImpl->mEditableControlInterface->TextChanged(); + mImpl->mEditableControlInterface->TextChanged(true); } } -void Controller::GetText( std::string& text ) const +void Controller::GetText(std::string& text) const { - if( !mImpl->IsShowingPlaceholderText() ) + if(!mImpl->IsShowingPlaceholderText()) { // Retrieves the text string. - mImpl->GetText( 0u, text ); + mImpl->GetText(0u, text); } else { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::GetText %p empty (but showing placeholder)\n", this ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::GetText %p empty (but showing placeholder)\n", this); } } -void Controller::SetPlaceholderText( PlaceholderType type, const std::string& text ) +void Controller::SetPlaceholderText(PlaceholderType type, const std::string& text) { - if( NULL != mImpl->mEventData ) - { - if( PLACEHOLDER_TYPE_INACTIVE == type ) - { - mImpl->mEventData->mPlaceholderTextInactive = text; - } - else - { - mImpl->mEventData->mPlaceholderTextActive = text; - } - - // Update placeholder if there is no text - if( mImpl->IsShowingPlaceholderText() || - ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) ) - { - ShowPlaceholderText(); - } - } + PlaceholderHandler::SetPlaceholderText(*this, type, text); } -void Controller::GetPlaceholderText( PlaceholderType type, std::string& text ) const +void Controller::GetPlaceholderText(PlaceholderType type, std::string& text) const { - if( NULL != mImpl->mEventData ) - { - if( PLACEHOLDER_TYPE_INACTIVE == type ) - { - text = mImpl->mEventData->mPlaceholderTextInactive; - } - else - { - text = mImpl->mEventData->mPlaceholderTextActive; - } - } + PlaceholderHandler::GetPlaceholderText(*this, type, text); } -void Controller::UpdateAfterFontChange( const std::string& newDefaultFont ) +void Controller::UpdateAfterFontChange(const std::string& newDefaultFont) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange\n"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::UpdateAfterFontChange\n"); - if( !mImpl->mFontDefaults->familyDefined ) // If user defined font then should not update when system font changes + if(!mImpl->mFontDefaults->familyDefined) // 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() ); + DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::UpdateAfterFontChange newDefaultFont(%s)\n", newDefaultFont.c_str()); mImpl->mFontDefaults->mFontDescription.family = newDefaultFont; ClearFontData(); @@ -824,17 +729,27 @@ void Controller::UpdateAfterFontChange( const std::string& newDefaultFont ) // public : Default style & Input style -void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) +void Controller::SetDefaultFontFamily(const std::string& defaultFontFamily) { - if( NULL == mImpl->mFontDefaults ) + if(NULL == mImpl->mFontDefaults) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mFontDescription.family = defaultFontFamily; - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str()); + DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::SetDefaultFontFamily %s\n", defaultFontFamily.c_str()); mImpl->mFontDefaults->familyDefined = !defaultFontFamily.empty(); + if(mImpl->mEventData) + { + // Update the cursor position if it's in editing mode + if(EventData::IsEditingState(mImpl->mEventData->mState)) + { + mImpl->mEventData->mDecoratorUpdated = true; + mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font family is updated. + } + } + // Clear the font-specific data ClearFontData(); @@ -843,7 +758,7 @@ void Controller::SetDefaultFontFamily( const std::string& defaultFontFamily ) const std::string& Controller::GetDefaultFontFamily() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->mFontDescription.family; } @@ -851,42 +766,35 @@ const std::string& Controller::GetDefaultFontFamily() const return EMPTY_STRING; } -void Controller::SetPlaceholderFontFamily( const std::string& placeholderTextFontFamily ) +void Controller::SetPlaceholderFontFamily(const std::string& placeholderTextFontFamily) { - if( NULL != mImpl->mEventData ) - { - if( NULL == mImpl->mEventData->mPlaceholderFont ) - { - mImpl->mEventData->mPlaceholderFont = new FontDefaults(); - } - - mImpl->mEventData->mPlaceholderFont->mFontDescription.family = placeholderTextFontFamily; - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::SetPlaceholderFontFamily %s\n", placeholderTextFontFamily.c_str()); - mImpl->mEventData->mPlaceholderFont->familyDefined = !placeholderTextFontFamily.empty(); - - mImpl->RequestRelayout(); - } + PlaceholderHandler::SetPlaceholderFontFamily(*this, placeholderTextFontFamily); } const std::string& Controller::GetPlaceholderFontFamily() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->mFontDescription.family; - } - - return EMPTY_STRING; + return PlaceholderHandler::GetPlaceholderFontFamily(*this); } -void Controller::SetDefaultFontWeight( FontWeight weight ) +void Controller::SetDefaultFontWeight(FontWeight weight) { - if( NULL == mImpl->mFontDefaults ) + if(NULL == mImpl->mFontDefaults) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mFontDescription.weight = weight; - mImpl->mFontDefaults->weightDefined = true; + mImpl->mFontDefaults->weightDefined = true; + + if(mImpl->mEventData) + { + // Update the cursor position if it's in editing mode + if(EventData::IsEditingState(mImpl->mEventData->mState)) + { + mImpl->mEventData->mDecoratorUpdated = true; + mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font weight is updated. + } + } // Clear the font-specific data ClearFontData(); @@ -896,7 +804,7 @@ void Controller::SetDefaultFontWeight( FontWeight weight ) bool Controller::IsDefaultFontWeightDefined() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->weightDefined; } @@ -906,7 +814,7 @@ bool Controller::IsDefaultFontWeightDefined() const FontWeight Controller::GetDefaultFontWeight() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->mFontDescription.weight; } @@ -914,50 +822,41 @@ FontWeight Controller::GetDefaultFontWeight() const return TextAbstraction::FontWeight::NORMAL; } -void Controller::SetPlaceholderTextFontWeight( FontWeight weight ) +void Controller::SetPlaceholderTextFontWeight(FontWeight weight) { - if( NULL != mImpl->mEventData ) - { - if( NULL == mImpl->mEventData->mPlaceholderFont ) - { - mImpl->mEventData->mPlaceholderFont = new FontDefaults(); - } - - mImpl->mEventData->mPlaceholderFont->mFontDescription.weight = weight; - mImpl->mEventData->mPlaceholderFont->weightDefined = true; - - mImpl->RequestRelayout(); - } + PlaceholderHandler::SetPlaceholderTextFontWeight(*this, weight); } bool Controller::IsPlaceholderTextFontWeightDefined() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->weightDefined; - } - return false; + return PlaceholderHandler::IsPlaceholderTextFontWeightDefined(*this); + ; } FontWeight Controller::GetPlaceholderTextFontWeight() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->mFontDescription.weight; - } - - return TextAbstraction::FontWeight::NORMAL; + return PlaceholderHandler::GetPlaceholderTextFontWeight(*this); } -void Controller::SetDefaultFontWidth( FontWidth width ) +void Controller::SetDefaultFontWidth(FontWidth width) { - if( NULL == mImpl->mFontDefaults ) + if(NULL == mImpl->mFontDefaults) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mFontDescription.width = width; - mImpl->mFontDefaults->widthDefined = true; + mImpl->mFontDefaults->widthDefined = true; + + if(mImpl->mEventData) + { + // Update the cursor position if it's in editing mode + if(EventData::IsEditingState(mImpl->mEventData->mState)) + { + mImpl->mEventData->mDecoratorUpdated = true; + mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font width is updated. + } + } // Clear the font-specific data ClearFontData(); @@ -967,7 +866,7 @@ void Controller::SetDefaultFontWidth( FontWidth width ) bool Controller::IsDefaultFontWidthDefined() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->widthDefined; } @@ -977,7 +876,7 @@ bool Controller::IsDefaultFontWidthDefined() const FontWidth Controller::GetDefaultFontWidth() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->mFontDescription.width; } @@ -985,50 +884,40 @@ FontWidth Controller::GetDefaultFontWidth() const return TextAbstraction::FontWidth::NORMAL; } -void Controller::SetPlaceholderTextFontWidth( FontWidth width ) +void Controller::SetPlaceholderTextFontWidth(FontWidth width) { - if( NULL != mImpl->mEventData ) - { - if( NULL == mImpl->mEventData->mPlaceholderFont ) - { - mImpl->mEventData->mPlaceholderFont = new FontDefaults(); - } - - mImpl->mEventData->mPlaceholderFont->mFontDescription.width = width; - mImpl->mEventData->mPlaceholderFont->widthDefined = true; - - mImpl->RequestRelayout(); - } + PlaceholderHandler::SetPlaceholderTextFontWidth(*this, width); } bool Controller::IsPlaceholderTextFontWidthDefined() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->widthDefined; - } - return false; + return PlaceholderHandler::IsPlaceholderTextFontWidthDefined(*this); } FontWidth Controller::GetPlaceholderTextFontWidth() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->mFontDescription.width; - } - - return TextAbstraction::FontWidth::NORMAL; + return PlaceholderHandler::GetPlaceholderTextFontWidth(*this); } -void Controller::SetDefaultFontSlant( FontSlant slant ) +void Controller::SetDefaultFontSlant(FontSlant slant) { - if( NULL == mImpl->mFontDefaults ) + if(NULL == mImpl->mFontDefaults) { mImpl->mFontDefaults = new FontDefaults(); } mImpl->mFontDefaults->mFontDescription.slant = slant; - mImpl->mFontDefaults->slantDefined = true; + mImpl->mFontDefaults->slantDefined = true; + + if(mImpl->mEventData) + { + // Update the cursor position if it's in editing mode + if(EventData::IsEditingState(mImpl->mEventData->mState)) + { + mImpl->mEventData->mDecoratorUpdated = true; + mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font slant is updated. + } + } // Clear the font-specific data ClearFontData(); @@ -1038,7 +927,7 @@ void Controller::SetDefaultFontSlant( FontSlant slant ) bool Controller::IsDefaultFontSlantDefined() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->slantDefined; } @@ -1047,7 +936,7 @@ bool Controller::IsDefaultFontSlantDefined() const FontSlant Controller::GetDefaultFontSlant() const { - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { return mImpl->mFontDefaults->mFontDescription.slant; } @@ -1055,82 +944,72 @@ FontSlant Controller::GetDefaultFontSlant() const return TextAbstraction::FontSlant::NORMAL; } -void Controller::SetPlaceholderTextFontSlant( FontSlant slant ) +void Controller::SetPlaceholderTextFontSlant(FontSlant slant) { - if( NULL != mImpl->mEventData ) - { - if( NULL == mImpl->mEventData->mPlaceholderFont ) - { - mImpl->mEventData->mPlaceholderFont = new FontDefaults(); - } - - mImpl->mEventData->mPlaceholderFont->mFontDescription.slant = slant; - mImpl->mEventData->mPlaceholderFont->slantDefined = true; - - mImpl->RequestRelayout(); - } + PlaceholderHandler::SetPlaceholderTextFontSlant(*this, slant); } bool Controller::IsPlaceholderTextFontSlantDefined() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->slantDefined; - } - return false; + return PlaceholderHandler::IsPlaceholderTextFontSlantDefined(*this); } FontSlant Controller::GetPlaceholderTextFontSlant() const { - if( ( NULL != mImpl->mEventData ) && ( NULL != mImpl->mEventData->mPlaceholderFont ) ) - { - return mImpl->mEventData->mPlaceholderFont->mFontDescription.slant; - } - - return TextAbstraction::FontSlant::NORMAL; + return PlaceholderHandler::GetPlaceholderTextFontSlant(*this); } -void Controller::SetDefaultFontSize( float fontSize, FontSizeType type ) +void Controller::SetDefaultFontSize(float fontSize, FontSizeType type) { - if( NULL == mImpl->mFontDefaults ) + if(NULL == mImpl->mFontDefaults) { mImpl->mFontDefaults = new FontDefaults(); } - switch( type ) + switch(type) { case POINT_SIZE: { mImpl->mFontDefaults->mDefaultPointSize = fontSize; - mImpl->mFontDefaults->sizeDefined = true; + mImpl->mFontDefaults->sizeDefined = true; break; } case PIXEL_SIZE: { // Point size = Pixel size * 72.f / DPI - unsigned int horizontalDpi = 0u; - unsigned int verticalDpi = 0u; - TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.GetDpi( horizontalDpi, verticalDpi ); + unsigned int horizontalDpi = 0u; + unsigned int verticalDpi = 0u; + TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); + fontClient.GetDpi(horizontalDpi, verticalDpi); - mImpl->mFontDefaults->mDefaultPointSize = ( fontSize * 72.f ) / static_cast< float >( horizontalDpi ); - mImpl->mFontDefaults->sizeDefined = true; + mImpl->mFontDefaults->mDefaultPointSize = (fontSize * 72.f) / static_cast(horizontalDpi); + mImpl->mFontDefaults->sizeDefined = true; break; } } + if(mImpl->mEventData) + { + // Update the cursor position if it's in editing mode + if(EventData::IsEditingState(mImpl->mEventData->mState)) + { + mImpl->mEventData->mDecoratorUpdated = true; + mImpl->mEventData->mUpdateCursorPosition = true; // Cursor position should be updated when the font size is updated. + } + } + // Clear the font-specific data ClearFontData(); mImpl->RequestRelayout(); } -float Controller::GetDefaultFontSize( FontSizeType type ) const +float Controller::GetDefaultFontSize(FontSizeType type) const { float value = 0.0f; - if( NULL != mImpl->mFontDefaults ) + if(NULL != mImpl->mFontDefaults) { - switch( type ) + switch(type) { case POINT_SIZE: { @@ -1140,12 +1019,12 @@ float Controller::GetDefaultFontSize( FontSizeType type ) const case PIXEL_SIZE: { // Pixel size = Point size * DPI / 72.f - unsigned int horizontalDpi = 0u; - unsigned int verticalDpi = 0u; - TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.GetDpi( horizontalDpi, verticalDpi ); + unsigned int horizontalDpi = 0u; + unsigned int verticalDpi = 0u; + TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); + fontClient.GetDpi(horizontalDpi, verticalDpi); - value = mImpl->mFontDefaults->mDefaultPointSize * static_cast< float >( horizontalDpi ) / 72.f; + value = mImpl->mFontDefaults->mDefaultPointSize * static_cast(horizontalDpi) / 72.f; break; } } @@ -1155,100 +1034,27 @@ float Controller::GetDefaultFontSize( FontSizeType type ) const return value; } -void Controller::SetPlaceholderTextFontSize( float fontSize, FontSizeType type ) +void Controller::SetPlaceholderTextFontSize(float fontSize, FontSizeType type) { - if( NULL != mImpl->mEventData ) - { - if( NULL == mImpl->mEventData->mPlaceholderFont ) - { - mImpl->mEventData->mPlaceholderFont = new FontDefaults(); - } - - switch( type ) - { - case POINT_SIZE: - { - mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = fontSize; - mImpl->mEventData->mPlaceholderFont->sizeDefined = true; - mImpl->mEventData->mIsPlaceholderPixelSize = false; // Font size flag - break; - } - case PIXEL_SIZE: - { - // Point size = Pixel size * 72.f / DPI - unsigned int horizontalDpi = 0u; - unsigned int verticalDpi = 0u; - TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.GetDpi( horizontalDpi, verticalDpi ); - - mImpl->mEventData->mPlaceholderFont->mDefaultPointSize = ( fontSize * 72.f ) / static_cast< float >( horizontalDpi ); - mImpl->mEventData->mPlaceholderFont->sizeDefined = true; - mImpl->mEventData->mIsPlaceholderPixelSize = true; // Font size flag - break; - } - } - - mImpl->RequestRelayout(); - } + PlaceholderHandler::SetPlaceholderTextFontSize(*this, fontSize, type); } -float Controller::GetPlaceholderTextFontSize( FontSizeType type ) const +float Controller::GetPlaceholderTextFontSize(FontSizeType type) const { - float value = 0.0f; - if( NULL != mImpl->mEventData ) - { - switch( type ) - { - case POINT_SIZE: - { - if( NULL != mImpl->mEventData->mPlaceholderFont ) - { - value = mImpl->mEventData->mPlaceholderFont->mDefaultPointSize; - } - else - { - // If the placeholder text font size is not set, then return the default font size. - value = GetDefaultFontSize( POINT_SIZE ); - } - break; - } - case PIXEL_SIZE: - { - if( NULL != mImpl->mEventData->mPlaceholderFont ) - { - // Pixel size = Point size * DPI / 72.f - unsigned int horizontalDpi = 0u; - unsigned int verticalDpi = 0u; - TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); - fontClient.GetDpi( horizontalDpi, verticalDpi ); - - value = mImpl->mEventData->mPlaceholderFont->mDefaultPointSize * static_cast< float >( horizontalDpi ) / 72.f; - } - else - { - // If the placeholder text font size is not set, then return the default font size. - value = GetDefaultFontSize( PIXEL_SIZE ); - } - break; - } - } - return value; - } - - return value; + return PlaceholderHandler::GetPlaceholderTextFontSize(*this, type); } -void Controller::SetDefaultColor( const Vector4& color ) +void Controller::SetDefaultColor(const Vector4& color) { mImpl->mTextColor = color; - if( !mImpl->IsShowingPlaceholderText() ) + if(!mImpl->IsShowingPlaceholderText()) { - mImpl->mModel->mVisualModel->SetTextColor( color ); + mImpl->mModel->mVisualModel->SetTextColor(color); mImpl->mModel->mLogicalModel->mColorRuns.Clear(); - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | COLOR ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | COLOR); mImpl->RequestRelayout(); } @@ -1259,33 +1065,19 @@ const Vector4& Controller::GetDefaultColor() const return mImpl->mTextColor; } -void Controller::SetPlaceholderTextColor( const Vector4& textColor ) +void Controller::SetPlaceholderTextColor(const Vector4& textColor) { - if( NULL != mImpl->mEventData ) - { - mImpl->mEventData->mPlaceholderTextColor = textColor; - } - - if( mImpl->IsShowingPlaceholderText() ) - { - mImpl->mModel->mVisualModel->SetTextColor( textColor ); - mImpl->RequestRelayout(); - } + PlaceholderHandler::SetPlaceholderTextColor(*this, textColor); } const Vector4& Controller::GetPlaceholderTextColor() const { - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mPlaceholderTextColor; - } - - return Color::BLACK; + return PlaceholderHandler::GetPlaceholderTextColor(*this); } -void Controller::SetShadowOffset( const Vector2& shadowOffset ) +void Controller::SetShadowOffset(const Vector2& shadowOffset) { - mImpl->mModel->mVisualModel->SetShadowOffset( shadowOffset ); + mImpl->mModel->mVisualModel->SetShadowOffset(shadowOffset); mImpl->RequestRelayout(); } @@ -1295,9 +1087,9 @@ const Vector2& Controller::GetShadowOffset() const return mImpl->mModel->mVisualModel->GetShadowOffset(); } -void Controller::SetShadowColor( const Vector4& shadowColor ) +void Controller::SetShadowColor(const Vector4& shadowColor) { - mImpl->mModel->mVisualModel->SetShadowColor( shadowColor ); + mImpl->mModel->mVisualModel->SetShadowColor(shadowColor); mImpl->RequestRelayout(); } @@ -1307,11 +1099,11 @@ const Vector4& Controller::GetShadowColor() const return mImpl->mModel->mVisualModel->GetShadowColor(); } -void Controller::SetShadowBlurRadius( const float& shadowBlurRadius ) +void Controller::SetShadowBlurRadius(const float& shadowBlurRadius) { - if ( fabsf( GetShadowBlurRadius() - shadowBlurRadius ) > Math::MACHINE_EPSILON_1 ) + if(fabsf(GetShadowBlurRadius() - shadowBlurRadius) > Math::MACHINE_EPSILON_1) { - mImpl->mModel->mVisualModel->SetShadowBlurRadius( shadowBlurRadius ); + mImpl->mModel->mVisualModel->SetShadowBlurRadius(shadowBlurRadius); mImpl->RequestRelayout(); } @@ -1322,9 +1114,9 @@ const float& Controller::GetShadowBlurRadius() const return mImpl->mModel->mVisualModel->GetShadowBlurRadius(); } -void Controller::SetUnderlineColor( const Vector4& color ) +void Controller::SetUnderlineColor(const Vector4& color) { - mImpl->mModel->mVisualModel->SetUnderlineColor( color ); + mImpl->mModel->mVisualModel->SetUnderlineColor(color); mImpl->RequestRelayout(); } @@ -1334,9 +1126,9 @@ const Vector4& Controller::GetUnderlineColor() const return mImpl->mModel->mVisualModel->GetUnderlineColor(); } -void Controller::SetUnderlineEnabled( bool enabled ) +void Controller::SetUnderlineEnabled(bool enabled) { - mImpl->mModel->mVisualModel->SetUnderlineEnabled( enabled ); + mImpl->mModel->mVisualModel->SetUnderlineEnabled(enabled); mImpl->RequestRelayout(); } @@ -1346,9 +1138,9 @@ bool Controller::IsUnderlineEnabled() const return mImpl->mModel->mVisualModel->IsUnderlineEnabled(); } -void Controller::SetUnderlineHeight( float height ) +void Controller::SetUnderlineHeight(float height) { - mImpl->mModel->mVisualModel->SetUnderlineHeight( height ); + mImpl->mModel->mVisualModel->SetUnderlineHeight(height); mImpl->RequestRelayout(); } @@ -1358,9 +1150,9 @@ float Controller::GetUnderlineHeight() const return mImpl->mModel->mVisualModel->GetUnderlineHeight(); } -void Controller::SetOutlineColor( const Vector4& color ) +void Controller::SetOutlineColor(const Vector4& color) { - mImpl->mModel->mVisualModel->SetOutlineColor( color ); + mImpl->mModel->mVisualModel->SetOutlineColor(color); mImpl->RequestRelayout(); } @@ -1370,9 +1162,9 @@ const Vector4& Controller::GetOutlineColor() const return mImpl->mModel->mVisualModel->GetOutlineColor(); } -void Controller::SetOutlineWidth( uint16_t width ) +void Controller::SetOutlineWidth(uint16_t width) { - mImpl->mModel->mVisualModel->SetOutlineWidth( width ); + mImpl->mModel->mVisualModel->SetOutlineWidth(width); mImpl->RequestRelayout(); } @@ -1382,9 +1174,9 @@ uint16_t Controller::GetOutlineWidth() const return mImpl->mModel->mVisualModel->GetOutlineWidth(); } -void Controller::SetBackgroundColor( const Vector4& color ) +void Controller::SetBackgroundColor(const Vector4& color) { - mImpl->mModel->mVisualModel->SetBackgroundColor( color ); + mImpl->mModel->mVisualModel->SetBackgroundColor(color); mImpl->RequestRelayout(); } @@ -1394,9 +1186,9 @@ const Vector4& Controller::GetBackgroundColor() const return mImpl->mModel->mVisualModel->GetBackgroundColor(); } -void Controller::SetBackgroundEnabled( bool enabled ) +void Controller::SetBackgroundEnabled(bool enabled) { - mImpl->mModel->mVisualModel->SetBackgroundEnabled( enabled ); + mImpl->mModel->mVisualModel->SetBackgroundEnabled(enabled); mImpl->RequestRelayout(); } @@ -1406,9 +1198,9 @@ bool Controller::IsBackgroundEnabled() const return mImpl->mModel->mVisualModel->IsBackgroundEnabled(); } -void Controller::SetDefaultEmbossProperties( const std::string& embossProperties ) +void Controller::SetDefaultEmbossProperties(const std::string& embossProperties) { - if( NULL == mImpl->mEmbossDefaults ) + if(NULL == mImpl->mEmbossDefaults) { mImpl->mEmbossDefaults = new EmbossDefaults(); } @@ -1418,7 +1210,7 @@ void Controller::SetDefaultEmbossProperties( const std::string& embossProperties const std::string& Controller::GetDefaultEmbossProperties() const { - if( NULL != mImpl->mEmbossDefaults ) + if(NULL != mImpl->mEmbossDefaults) { return mImpl->mEmbossDefaults->properties; } @@ -1426,9 +1218,9 @@ const std::string& Controller::GetDefaultEmbossProperties() const return EMPTY_STRING; } -void Controller::SetDefaultOutlineProperties( const std::string& outlineProperties ) +void Controller::SetDefaultOutlineProperties(const std::string& outlineProperties) { - if( NULL == mImpl->mOutlineDefaults ) + if(NULL == mImpl->mOutlineDefaults) { mImpl->mOutlineDefaults = new OutlineDefaults(); } @@ -1438,7 +1230,7 @@ void Controller::SetDefaultOutlineProperties( const std::string& outlineProperti const std::string& Controller::GetDefaultOutlineProperties() const { - if( NULL != mImpl->mOutlineDefaults ) + if(NULL != mImpl->mOutlineDefaults) { return mImpl->mOutlineDefaults->properties; } @@ -1446,9 +1238,9 @@ const std::string& Controller::GetDefaultOutlineProperties() const return EMPTY_STRING; } -bool Controller::SetDefaultLineSpacing( float lineSpacing ) +bool Controller::SetDefaultLineSpacing(float lineSpacing) { - if( std::fabs( lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing() ) > Math::MACHINE_EPSILON_1000 ) + if(std::fabs(lineSpacing - mImpl->mLayoutEngine.GetDefaultLineSpacing()) > Math::MACHINE_EPSILON_1000) { mImpl->mLayoutEngine.SetDefaultLineSpacing(lineSpacing); mImpl->mRecalculateNaturalSize = true; @@ -1462,9 +1254,9 @@ float Controller::GetDefaultLineSpacing() const return mImpl->mLayoutEngine.GetDefaultLineSpacing(); } -bool Controller::SetDefaultLineSize( float lineSize ) +bool Controller::SetDefaultLineSize(float lineSize) { - if( std::fabs( lineSize - mImpl->mLayoutEngine.GetDefaultLineSize() ) > Math::MACHINE_EPSILON_1000 ) + if(std::fabs(lineSize - mImpl->mLayoutEngine.GetDefaultLineSize()) > Math::MACHINE_EPSILON_1000) { mImpl->mLayoutEngine.SetDefaultLineSize(lineSize); mImpl->mRecalculateNaturalSize = true; @@ -1478,432 +1270,138 @@ float Controller::GetDefaultLineSize() const return mImpl->mLayoutEngine.GetDefaultLineSize(); } -void Controller::SetInputColor( const Vector4& color ) +void Controller::SetInputColor(const Vector4& color) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { - mImpl->mEventData->mInputStyle.textColor = color; + mImpl->mEventData->mInputStyle.textColor = color; mImpl->mEventData->mInputStyle.isDefaultColor = false; - if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState ) + if(EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState) { - const bool handlesCrossed = mImpl->mEventData->mLeftSelectionPosition > mImpl->mEventData->mRightSelectionPosition; + if(EventData::SELECTING == mImpl->mEventData->mState) + { + const bool handlesCrossed = mImpl->mEventData->mLeftSelectionPosition > mImpl->mEventData->mRightSelectionPosition; - // Get start and end position of selection - const CharacterIndex startOfSelectedText = handlesCrossed ? mImpl->mEventData->mRightSelectionPosition : mImpl->mEventData->mLeftSelectionPosition; - const Length lengthOfSelectedText = ( handlesCrossed ? mImpl->mEventData->mLeftSelectionPosition : mImpl->mEventData->mRightSelectionPosition ) - startOfSelectedText; + // Get start and end position of selection + const CharacterIndex startOfSelectedText = handlesCrossed ? mImpl->mEventData->mRightSelectionPosition : mImpl->mEventData->mLeftSelectionPosition; + const Length lengthOfSelectedText = (handlesCrossed ? mImpl->mEventData->mLeftSelectionPosition : mImpl->mEventData->mRightSelectionPosition) - startOfSelectedText; - // Add the color run. - const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mColorRuns.Count(); - mImpl->mModel->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + // Add the color run. + const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mColorRuns.Count(); + mImpl->mModel->mLogicalModel->mColorRuns.Resize(numberOfRuns + 1u); - ColorRun& colorRun = *( mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); - colorRun.color = color; - colorRun.characterRun.characterIndex = startOfSelectedText; - colorRun.characterRun.numberOfCharacters = lengthOfSelectedText; + ColorRun& colorRun = *(mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns); + colorRun.color = color; + colorRun.characterRun.characterIndex = startOfSelectedText; + colorRun.characterRun.numberOfCharacters = lengthOfSelectedText; + + mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; + } + else + { + mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + } // Request to relayout. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | COLOR ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | COLOR); mImpl->RequestRelayout(); - - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; } } } const Vector4& Controller::GetInputColor() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mInputStyle.textColor; } // Return the default text's color if there is no EventData. return mImpl->mTextColor; - } -void Controller::SetInputFontFamily( const std::string& fontFamily ) +void Controller::SetInputFontFamily(const std::string& fontFamily) { - if( NULL != mImpl->mEventData ) - { - mImpl->mEventData->mInputStyle.familyName = fontFamily; - mImpl->mEventData->mInputStyle.isFamilyDefined = true; - - if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState ) - { - CharacterIndex startOfSelectedText = 0u; - Length lengthOfSelectedText = 0u; - - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - // Update a font description run for the selecting state. - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - - fontDescriptionRun.familyLength = fontFamily.size(); - fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; - memcpy( fontDescriptionRun.familyName, fontFamily.c_str(), fontDescriptionRun.familyLength ); - fontDescriptionRun.familyDefined = true; - - // The memory allocated for the font family name is freed when the font description is removed from the logical model. - - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - } - else - { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); - } - - // Request to relayout. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - VALIDATE_FONTS | - SHAPE_TEXT | - GET_GLYPH_METRICS | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER | - ALIGN ); - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); - - // As the font changes, recalculate the handle positions is needed. - mImpl->mEventData->mUpdateLeftSelectionPosition = true; - mImpl->mEventData->mUpdateRightSelectionPosition = true; - mImpl->mEventData->mUpdateHighlightBox = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } - } + InputFontHandler::SetInputFontFamily(*this, fontFamily); } const std::string& Controller::GetInputFontFamily() const { - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mInputStyle.familyName; - } - - // Return the default font's family if there is no EventData. - return GetDefaultFontFamily(); + return InputFontHandler::GetInputFontFamily(*this); } -void Controller::SetInputFontWeight( FontWeight weight ) +void Controller::SetInputFontWeight(FontWeight weight) { - if( NULL != mImpl->mEventData ) - { - mImpl->mEventData->mInputStyle.weight = weight; - mImpl->mEventData->mInputStyle.isWeightDefined = true; - - if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState ) - { - CharacterIndex startOfSelectedText = 0u; - Length lengthOfSelectedText = 0u; - - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - // Update a font description run for the selecting state. - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - - fontDescriptionRun.weight = weight; - fontDescriptionRun.weightDefined = true; - - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - } - else - { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); - } - - // Request to relayout. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - VALIDATE_FONTS | - SHAPE_TEXT | - GET_GLYPH_METRICS | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER | - ALIGN ); - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); - - // As the font might change, recalculate the handle positions is needed. - mImpl->mEventData->mUpdateLeftSelectionPosition = true; - mImpl->mEventData->mUpdateRightSelectionPosition = true; - mImpl->mEventData->mUpdateHighlightBox = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } - } + InputFontHandler::SetInputFontWeight(*this, weight); } bool Controller::IsInputFontWeightDefined() const { - bool defined = false; - - if( NULL != mImpl->mEventData ) - { - defined = mImpl->mEventData->mInputStyle.isWeightDefined; - } - - return defined; + return InputFontHandler::IsInputFontWeightDefined(*this); } FontWeight Controller::GetInputFontWeight() const { - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mInputStyle.weight; - } - - return GetDefaultFontWeight(); + return InputFontHandler::GetInputFontWeight(*this); } -void Controller::SetInputFontWidth( FontWidth width ) +void Controller::SetInputFontWidth(FontWidth width) { - if( NULL != mImpl->mEventData ) - { - mImpl->mEventData->mInputStyle.width = width; - mImpl->mEventData->mInputStyle.isWidthDefined = true; + InputFontHandler::SetInputFontWidth(*this, width); +} - if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState ) - { - CharacterIndex startOfSelectedText = 0u; - Length lengthOfSelectedText = 0u; +bool Controller::IsInputFontWidthDefined() const +{ + return InputFontHandler::IsInputFontWidthDefined(*this); +} - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - // Update a font description run for the selecting state. - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); +FontWidth Controller::GetInputFontWidth() const +{ + return InputFontHandler::GetInputFontWidth(*this); +} - fontDescriptionRun.width = width; - fontDescriptionRun.widthDefined = true; - - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - } - else - { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); - } - - // Request to relayout. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - VALIDATE_FONTS | - SHAPE_TEXT | - GET_GLYPH_METRICS | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER | - ALIGN ); - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); - - // As the font might change, recalculate the handle positions is needed. - mImpl->mEventData->mUpdateLeftSelectionPosition = true; - mImpl->mEventData->mUpdateRightSelectionPosition = true; - mImpl->mEventData->mUpdateHighlightBox = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } - } -} - -bool Controller::IsInputFontWidthDefined() const -{ - bool defined = false; - - if( NULL != mImpl->mEventData ) - { - defined = mImpl->mEventData->mInputStyle.isWidthDefined; - } - - return defined; -} - -FontWidth Controller::GetInputFontWidth() const -{ - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mInputStyle.width; - } - - return GetDefaultFontWidth(); -} - -void Controller::SetInputFontSlant( FontSlant slant ) -{ - if( NULL != mImpl->mEventData ) - { - mImpl->mEventData->mInputStyle.slant = slant; - mImpl->mEventData->mInputStyle.isSlantDefined = true; - - if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState ) - { - CharacterIndex startOfSelectedText = 0u; - Length lengthOfSelectedText = 0u; - - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - // Update a font description run for the selecting state. - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - - fontDescriptionRun.slant = slant; - fontDescriptionRun.slantDefined = true; - - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - } - else - { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); - } - - // Request to relayout. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - VALIDATE_FONTS | - SHAPE_TEXT | - GET_GLYPH_METRICS | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER | - ALIGN ); - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); - - // As the font might change, recalculate the handle positions is needed. - mImpl->mEventData->mUpdateLeftSelectionPosition = true; - mImpl->mEventData->mUpdateRightSelectionPosition = true; - mImpl->mEventData->mUpdateHighlightBox = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } - } -} +void Controller::SetInputFontSlant(FontSlant slant) +{ + InputFontHandler::SetInputFontSlant(*this, slant); +} bool Controller::IsInputFontSlantDefined() const { - bool defined = false; - - if( NULL != mImpl->mEventData ) - { - defined = mImpl->mEventData->mInputStyle.isSlantDefined; - } - - return defined; + return InputFontHandler::IsInputFontSlantDefined(*this); } FontSlant Controller::GetInputFontSlant() const { - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mInputStyle.slant; - } - - return GetDefaultFontSlant(); + return InputFontHandler::GetInputFontSlant(*this); } -void Controller::SetInputFontPointSize( float size ) +void Controller::SetInputFontPointSize(float size) { - if( NULL != mImpl->mEventData ) - { - mImpl->mEventData->mInputStyle.size = size; - mImpl->mEventData->mInputStyle.isSizeDefined = true; - - if( EventData::SELECTING == mImpl->mEventData->mState || EventData::EDITING == mImpl->mEventData->mState || EventData::INACTIVE == mImpl->mEventData->mState ) - { - CharacterIndex startOfSelectedText = 0u; - Length lengthOfSelectedText = 0u; - - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - // Update a font description run for the selecting state. - FontDescriptionRun& fontDescriptionRun = UpdateSelectionFontStyleRun( mImpl->mEventData, - mImpl->mModel->mLogicalModel, - startOfSelectedText, - lengthOfSelectedText ); - - fontDescriptionRun.size = static_cast( size * 64.f ); - fontDescriptionRun.sizeDefined = true; - - mImpl->mTextUpdateInfo.mCharacterIndex = startOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = lengthOfSelectedText; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = lengthOfSelectedText; - } - else - { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; - mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); - } - - // Request to relayout. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - VALIDATE_FONTS | - SHAPE_TEXT | - GET_GLYPH_METRICS | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER | - ALIGN ); - mImpl->mRecalculateNaturalSize = true; - mImpl->RequestRelayout(); - - // As the font might change, recalculate the handle positions is needed. - mImpl->mEventData->mUpdateLeftSelectionPosition = true; - mImpl->mEventData->mUpdateRightSelectionPosition = true; - mImpl->mEventData->mUpdateHighlightBox = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } - } + InputFontHandler::SetInputFontPointSize(*this, size); } float Controller::GetInputFontPointSize() const { - if( NULL != mImpl->mEventData ) - { - return mImpl->mEventData->mInputStyle.size; - } - - // Return the default font's point size if there is no EventData. - return GetDefaultFontSize( Text::Controller::POINT_SIZE ); + return InputFontHandler::GetInputFontPointSize(*this); } -void Controller::SetInputLineSpacing( float lineSpacing ) +void Controller::SetInputLineSpacing(float lineSpacing) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { - mImpl->mEventData->mInputStyle.lineSpacing = lineSpacing; + mImpl->mEventData->mInputStyle.lineSpacing = lineSpacing; mImpl->mEventData->mInputStyle.isLineSpacingDefined = true; } } float Controller::GetInputLineSpacing() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mInputStyle.lineSpacing; } @@ -1911,9 +1409,9 @@ float Controller::GetInputLineSpacing() const return 0.f; } -void Controller::SetInputShadowProperties( const std::string& shadowProperties ) +void Controller::SetInputShadowProperties(const std::string& shadowProperties) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mInputStyle.shadowProperties = shadowProperties; } @@ -1921,7 +1419,7 @@ void Controller::SetInputShadowProperties( const std::string& shadowProperties ) const std::string& Controller::GetInputShadowProperties() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mInputStyle.shadowProperties; } @@ -1929,9 +1427,9 @@ const std::string& Controller::GetInputShadowProperties() const return EMPTY_STRING; } -void Controller::SetInputUnderlineProperties( const std::string& underlineProperties ) +void Controller::SetInputUnderlineProperties(const std::string& underlineProperties) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mInputStyle.underlineProperties = underlineProperties; } @@ -1939,7 +1437,7 @@ void Controller::SetInputUnderlineProperties( const std::string& underlineProper const std::string& Controller::GetInputUnderlineProperties() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mInputStyle.underlineProperties; } @@ -1947,9 +1445,9 @@ const std::string& Controller::GetInputUnderlineProperties() const return EMPTY_STRING; } -void Controller::SetInputEmbossProperties( const std::string& embossProperties ) +void Controller::SetInputEmbossProperties(const std::string& embossProperties) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mInputStyle.embossProperties = embossProperties; } @@ -1957,7 +1455,7 @@ void Controller::SetInputEmbossProperties( const std::string& embossProperties ) const std::string& Controller::GetInputEmbossProperties() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mInputStyle.embossProperties; } @@ -1965,9 +1463,9 @@ const std::string& Controller::GetInputEmbossProperties() const return GetDefaultEmbossProperties(); } -void Controller::SetInputOutlineProperties( const std::string& outlineProperties ) +void Controller::SetInputOutlineProperties(const std::string& outlineProperties) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mInputStyle.outlineProperties = outlineProperties; } @@ -1975,7 +1473,7 @@ void Controller::SetInputOutlineProperties( const std::string& outlineProperties const std::string& Controller::GetInputOutlineProperties() const { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mInputStyle.outlineProperties; } @@ -1983,9 +1481,9 @@ const std::string& Controller::GetInputOutlineProperties() const return GetDefaultOutlineProperties(); } -void Controller::SetInputModePassword( bool passwordInput ) +void Controller::SetInputModePassword(bool passwordInput) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mPasswordInput = passwordInput; } @@ -1993,16 +1491,16 @@ void Controller::SetInputModePassword( bool passwordInput ) bool Controller::IsInputModePassword() { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { return mImpl->mEventData->mPasswordInput; } return false; } -void Controller::SetNoTextDoubleTapAction( NoTextTap::Action action ) +void Controller::SetNoTextDoubleTapAction(NoTextTap::Action action) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mDoubleTapAction = action; } @@ -2012,7 +1510,7 @@ Controller::NoTextTap::Action Controller::GetNoTextDoubleTapAction() const { NoTextTap::Action action = NoTextTap::NO_ACTION; - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { action = mImpl->mEventData->mDoubleTapAction; } @@ -2020,9 +1518,9 @@ Controller::NoTextTap::Action Controller::GetNoTextDoubleTapAction() const return action; } -void Controller::SetNoTextLongPressAction( NoTextTap::Action action ) +void Controller::SetNoTextLongPressAction(NoTextTap::Action action) { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mLongPressAction = action; } @@ -2032,7 +1530,7 @@ Controller::NoTextTap::Action Controller::GetNoTextLongPressAction() const { NoTextTap::Action action = NoTextTap::NO_ACTION; - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { action = mImpl->mEventData->mLongPressAction; } @@ -2045,7 +1543,7 @@ bool Controller::IsUnderlineSetByString() return mImpl->mUnderlineSetByString; } -void Controller::UnderlineSetByString( bool setByString ) +void Controller::UnderlineSetByString(bool setByString) { mImpl->mUnderlineSetByString = setByString; } @@ -2055,7 +1553,7 @@ bool Controller::IsShadowSetByString() return mImpl->mShadowSetByString; } -void Controller::ShadowSetByString( bool setByString ) +void Controller::ShadowSetByString(bool setByString) { mImpl->mShadowSetByString = setByString; } @@ -2065,7 +1563,7 @@ bool Controller::IsOutlineSetByString() return mImpl->mOutlineSetByString; } -void Controller::OutlineSetByString( bool setByString ) +void Controller::OutlineSetByString(bool setByString) { mImpl->mOutlineSetByString = setByString; } @@ -2075,7 +1573,7 @@ bool Controller::IsFontStyleSetByString() return mImpl->mFontStyleSetByString; } -void Controller::FontStyleSetByString( bool setByString ) +void Controller::FontStyleSetByString(bool setByString) { mImpl->mFontStyleSetByString = setByString; } @@ -2094,53 +1592,53 @@ View& Controller::GetView() Vector3 Controller::GetNaturalSize() { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetNaturalSize\n"); Vector3 naturalSize; // Make sure the model is up-to-date before layouting ProcessModifyEvents(); - if( mImpl->mRecalculateNaturalSize ) + if(mImpl->mRecalculateNaturalSize) { // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - BIDI_INFO | - SHAPE_TEXT | - GET_GLYPH_METRICS ); + const OperationsMask onlyOnceOperations = static_cast(CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS); // Set the update info to relayout the whole text. - mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); // Make sure the model is up-to-date before layouting - mImpl->UpdateModel( onlyOnceOperations ); + mImpl->UpdateModel(onlyOnceOperations); // Layout the text for the new width. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT | REORDER ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | LAYOUT | REORDER); // Store the actual control's size to restore later. const Size actualControlSize = mImpl->mModel->mVisualModel->mControlSize; - DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), - static_cast( onlyOnceOperations | - LAYOUT | REORDER ), - naturalSize.GetVectorXY() ); + DoRelayout(Size(MAX_FLOAT, MAX_FLOAT), + static_cast(onlyOnceOperations | + LAYOUT | REORDER), + naturalSize.GetVectorXY()); // Do not do again the only once operations. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending & ~onlyOnceOperations); // Do the size related operations again. - const OperationsMask sizeOperations = static_cast( LAYOUT | - ALIGN | - REORDER ); - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + const OperationsMask sizeOperations = static_cast(LAYOUT | + ALIGN | + REORDER); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | sizeOperations); // Stores the natural size to avoid recalculate it again // unless the text/style changes. - mImpl->mModel->mVisualModel->SetNaturalSize( naturalSize.GetVectorXY() ); + mImpl->mModel->mVisualModel->SetNaturalSize(naturalSize.GetVectorXY()); mImpl->mRecalculateNaturalSize = false; @@ -2151,160 +1649,159 @@ Vector3 Controller::GetNaturalSize() // Restore the actual control's size. mImpl->mModel->mVisualModel->mControlSize = actualControlSize; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize calculated %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z); } else { naturalSize = mImpl->mModel->mVisualModel->GetNaturalSize(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetNaturalSize cached %f,%f,%f\n", naturalSize.x, naturalSize.y, naturalSize.z); } - naturalSize.x = ConvertToEven( naturalSize.x ); - naturalSize.y = ConvertToEven( naturalSize.y ); + naturalSize.x = ConvertToEven(naturalSize.x); + naturalSize.y = ConvertToEven(naturalSize.y); return naturalSize; } -bool Controller::CheckForTextFit( float pointSize, Size& layoutSize ) +bool Controller::CheckForTextFit(float pointSize, Size& layoutSize) { Size textSize; mImpl->mFontDefaults->mFitPointSize = pointSize; - mImpl->mFontDefaults->sizeDefined = true; + mImpl->mFontDefaults->sizeDefined = true; ClearFontData(); // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - BIDI_INFO | - SHAPE_TEXT| - GET_GLYPH_METRICS ); - - mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + const OperationsMask onlyOnceOperations = static_cast(CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS); + + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); // Make sure the model is up-to-date before layouting - mImpl->UpdateModel( onlyOnceOperations ); + mImpl->UpdateModel(onlyOnceOperations); - DoRelayout( Size( layoutSize.width, MAX_FLOAT ), - static_cast( onlyOnceOperations | LAYOUT), - textSize); + DoRelayout(Size(layoutSize.width, MAX_FLOAT), + static_cast(onlyOnceOperations | LAYOUT), + textSize); // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.Clear(); mImpl->mTextUpdateInfo.mClearAll = true; - if( textSize.width > layoutSize.width || textSize.height > layoutSize.height ) + if(textSize.width > layoutSize.width || textSize.height > layoutSize.height) { return false; } return true; } -void Controller::FitPointSizeforLayout( Size layoutSize ) +void Controller::FitPointSizeforLayout(Size layoutSize) { - const OperationsMask operations = mImpl->mOperationsPending; - if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) || mImpl->mTextFitContentSize != layoutSize ) + const OperationsMask operations = mImpl->mOperationsPending; + if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations) || mImpl->mTextFitContentSize != layoutSize) { - bool actualellipsis = mImpl->mModel->mElideEnabled; - float minPointSize = mImpl->mTextFitMinSize; - float maxPointSize = mImpl->mTextFitMaxSize; - float pointInterval = mImpl->mTextFitStepSize; + bool actualellipsis = mImpl->mModel->mElideEnabled; + float minPointSize = mImpl->mTextFitMinSize; + float maxPointSize = mImpl->mTextFitMaxSize; + float pointInterval = mImpl->mTextFitStepSize; mImpl->mModel->mElideEnabled = false; Vector pointSizeArray; // check zero value - if( pointInterval < 1.f ) + if(pointInterval < 1.f) { mImpl->mTextFitStepSize = pointInterval = 1.0f; } - pointSizeArray.Reserve( static_cast< unsigned int >( ceil( ( maxPointSize - minPointSize ) / pointInterval ) ) ); + pointSizeArray.Reserve(static_cast(ceil((maxPointSize - minPointSize) / pointInterval))); - for( float i = minPointSize; i < maxPointSize; i += pointInterval ) + for(float i = minPointSize; i < maxPointSize; i += pointInterval) { - pointSizeArray.PushBack( i ); + pointSizeArray.PushBack(i); } - pointSizeArray.PushBack( maxPointSize ); + pointSizeArray.PushBack(maxPointSize); int bestSizeIndex = 0; - int min = bestSizeIndex + 1; - int max = pointSizeArray.Size() - 1; - while( min <= max ) + int min = bestSizeIndex + 1; + int max = pointSizeArray.Size() - 1; + while(min <= max) { - int destI = ( min + max ) / 2; + int destI = (min + max) / 2; - if( CheckForTextFit( pointSizeArray[destI], layoutSize ) ) + if(CheckForTextFit(pointSizeArray[destI], layoutSize)) { bestSizeIndex = min; - min = destI + 1; + min = destI + 1; } else { - max = destI - 1; + max = destI - 1; bestSizeIndex = max; } } - mImpl->mModel->mElideEnabled = actualellipsis; + mImpl->mModel->mElideEnabled = actualellipsis; mImpl->mFontDefaults->mFitPointSize = pointSizeArray[bestSizeIndex]; - mImpl->mFontDefaults->sizeDefined = true; + mImpl->mFontDefaults->sizeDefined = true; ClearFontData(); } } -float Controller::GetHeightForWidth( float width ) +float Controller::GetHeightForWidth(float width) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", this, width ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::GetHeightForWidth %p width %f\n", this, width); // Make sure the model is up-to-date before layouting ProcessModifyEvents(); Size layoutSize; - if( fabsf( width - mImpl->mModel->mVisualModel->mControlSize.width ) > Math::MACHINE_EPSILON_1000 || - mImpl->mTextUpdateInfo.mFullRelayoutNeeded || - mImpl->mTextUpdateInfo.mClearAll ) + if(fabsf(width - mImpl->mModel->mVisualModel->mControlSize.width) > Math::MACHINE_EPSILON_1000 || + mImpl->mTextUpdateInfo.mFullRelayoutNeeded || + mImpl->mTextUpdateInfo.mClearAll) { // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - BIDI_INFO | - SHAPE_TEXT | - GET_GLYPH_METRICS ); + const OperationsMask onlyOnceOperations = static_cast(CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS); // Set the update info to relayout the whole text. - mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); // Make sure the model is up-to-date before layouting - mImpl->UpdateModel( onlyOnceOperations ); - + mImpl->UpdateModel(onlyOnceOperations); // Layout the text for the new width. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | LAYOUT ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | LAYOUT); // Store the actual control's width. const float actualControlWidth = mImpl->mModel->mVisualModel->mControlSize.width; - DoRelayout( Size( width, MAX_FLOAT ), - static_cast( onlyOnceOperations | - LAYOUT ), - layoutSize ); + DoRelayout(Size(width, MAX_FLOAT), + static_cast(onlyOnceOperations | + LAYOUT), + layoutSize); // Do not do again the only once operations. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending & ~onlyOnceOperations); // Do the size related operations again. - const OperationsMask sizeOperations = static_cast( LAYOUT | - ALIGN | - REORDER ); + const OperationsMask sizeOperations = static_cast(LAYOUT | + ALIGN | + REORDER); - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | sizeOperations ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | sizeOperations); // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.Clear(); @@ -2313,20 +1810,20 @@ float Controller::GetHeightForWidth( float width ) // Restore the actual control's width. mImpl->mModel->mVisualModel->mControlSize.width = actualControlWidth; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth calculated %f\n", layoutSize.height); } else { layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::GetHeightForWidth cached %f\n", layoutSize.height); } return layoutSize.height; } -int Controller::GetLineCount( float width ) +int Controller::GetLineCount(float width) { - GetHeightForWidth( width ); + GetHeightForWidth(width); int numberofLines = mImpl->mModel->GetNumberOfLines(); return numberofLines; } @@ -2340,146 +1837,51 @@ float Controller::GetScrollAmountByUserInput() { float scrollAmount = 0.0f; - if (NULL != mImpl->mEventData && mImpl->mEventData->mCheckScrollAmount) + if(NULL != mImpl->mEventData && mImpl->mEventData->mCheckScrollAmount) { - scrollAmount = mImpl->mModel->mScrollPosition.y - mImpl->mModel->mScrollPositionLast.y; + scrollAmount = mImpl->mModel->mScrollPosition.y - mImpl->mModel->mScrollPositionLast.y; mImpl->mEventData->mCheckScrollAmount = false; } return scrollAmount; } -bool Controller::GetTextScrollInfo( float& scrollPosition, float& controlHeight, float& layoutHeight ) +bool Controller::GetTextScrollInfo(float& scrollPosition, float& controlHeight, float& layoutHeight) { const Vector2& layout = mImpl->mModel->mVisualModel->GetLayoutSize(); - bool isScrolled; + bool isScrolled; - controlHeight = mImpl->mModel->mVisualModel->mControlSize.height; - layoutHeight = layout.height; + controlHeight = mImpl->mModel->mVisualModel->mControlSize.height; + layoutHeight = layout.height; scrollPosition = mImpl->mModel->mScrollPosition.y; - isScrolled = !Equals( mImpl->mModel->mScrollPosition.y, mImpl->mModel->mScrollPositionLast.y, Math::MACHINE_EPSILON_1 ); + isScrolled = !Equals(mImpl->mModel->mScrollPosition.y, mImpl->mModel->mScrollPositionLast.y, Math::MACHINE_EPSILON_1); return isScrolled; } -void Controller::SetHiddenInputOption(const Property::Map& options ) +void Controller::SetHiddenInputOption(const Property::Map& options) { - if( NULL == mImpl->mHiddenInput ) + if(NULL == mImpl->mHiddenInput) { - mImpl->mHiddenInput = new HiddenText( this ); + mImpl->mHiddenInput = new HiddenText(this); } mImpl->mHiddenInput->SetProperties(options); } -void Controller::GetHiddenInputOption(Property::Map& options ) +void Controller::GetHiddenInputOption(Property::Map& options) { - if( NULL != mImpl->mHiddenInput ) + if(NULL != mImpl->mHiddenInput) { mImpl->mHiddenInput->GetProperties(options); } } -void Controller::SetPlaceholderProperty( const Property::Map& map ) +void Controller::SetPlaceholderProperty(const Property::Map& map) { - const Property::Map::SizeType count = map.Count(); - - for( Property::Map::SizeType position = 0; position < count; ++position ) - { - KeyValuePair keyValue = map.GetKeyValue( position ); - Property::Key& key = keyValue.first; - Property::Value& value = keyValue.second; - - if( key == Toolkit::Text::PlaceHolder::Property::TEXT || key == PLACEHOLDER_TEXT ) - { - std::string text = ""; - value.Get( text ); - SetPlaceholderText( Controller::PLACEHOLDER_TYPE_INACTIVE, text ); - } - else if( key == Toolkit::Text::PlaceHolder::Property::TEXT_FOCUSED || key == PLACEHOLDER_TEXT_FOCUSED ) - { - std::string text = ""; - value.Get( text ); - SetPlaceholderText( Controller::PLACEHOLDER_TYPE_ACTIVE, text ); - } - else if( key == Toolkit::Text::PlaceHolder::Property::COLOR || key == PLACEHOLDER_COLOR ) - { - Vector4 textColor; - value.Get( textColor ); - if( GetPlaceholderTextColor() != textColor ) - { - SetPlaceholderTextColor( textColor ); - } - } - else if( key == Toolkit::Text::PlaceHolder::Property::FONT_FAMILY || key == PLACEHOLDER_FONT_FAMILY ) - { - std::string fontFamily = ""; - value.Get( fontFamily ); - SetPlaceholderFontFamily( fontFamily ); - } - else if( key == Toolkit::Text::PlaceHolder::Property::FONT_STYLE || key == PLACEHOLDER_FONT_STYLE ) - { - SetFontStyleProperty( this, value, Text::FontStyle::PLACEHOLDER ); - } - else if( key == Toolkit::Text::PlaceHolder::Property::POINT_SIZE || key == PLACEHOLDER_POINT_SIZE ) - { - float pointSize; - value.Get( pointSize ); - if( !Equals( GetPlaceholderTextFontSize( Text::Controller::POINT_SIZE ), pointSize ) ) - { - SetPlaceholderTextFontSize( pointSize, Text::Controller::POINT_SIZE ); - } - } - else if( key == Toolkit::Text::PlaceHolder::Property::PIXEL_SIZE || key == PLACEHOLDER_PIXEL_SIZE ) - { - float pixelSize; - value.Get( pixelSize ); - if( !Equals( GetPlaceholderTextFontSize( Text::Controller::PIXEL_SIZE ), pixelSize ) ) - { - SetPlaceholderTextFontSize( pixelSize, Text::Controller::PIXEL_SIZE ); - } - } - else if( key == Toolkit::Text::PlaceHolder::Property::ELLIPSIS || key == PLACEHOLDER_ELLIPSIS ) - { - bool ellipsis; - value.Get( ellipsis ); - SetPlaceholderTextElideEnabled( ellipsis ); - } - } + PlaceholderHandler::SetPlaceholderProperty(*this, map); } -void Controller::GetPlaceholderProperty( Property::Map& map ) +void Controller::GetPlaceholderProperty(Property::Map& map) { - if( NULL != mImpl->mEventData ) - { - if( !mImpl->mEventData->mPlaceholderTextActive.empty() ) - { - map[ Text::PlaceHolder::Property::TEXT_FOCUSED ] = mImpl->mEventData->mPlaceholderTextActive; - } - if( !mImpl->mEventData->mPlaceholderTextInactive.empty() ) - { - map[ Text::PlaceHolder::Property::TEXT ] = mImpl->mEventData->mPlaceholderTextInactive; - } - - map[ Text::PlaceHolder::Property::COLOR ] = mImpl->mEventData->mPlaceholderTextColor; - map[ Text::PlaceHolder::Property::FONT_FAMILY ] = GetPlaceholderFontFamily(); - - Property::Value fontStyleMapGet; - GetFontStyleProperty( this, fontStyleMapGet, Text::FontStyle::PLACEHOLDER ); - map[ Text::PlaceHolder::Property::FONT_STYLE ] = fontStyleMapGet; - - // Choose font size : POINT_SIZE or PIXEL_SIZE - if( !mImpl->mEventData->mIsPlaceholderPixelSize ) - { - map[ Text::PlaceHolder::Property::POINT_SIZE ] = GetPlaceholderTextFontSize( Text::Controller::POINT_SIZE ); - } - else - { - map[ Text::PlaceHolder::Property::PIXEL_SIZE ] = GetPlaceholderTextFontSize( Text::Controller::PIXEL_SIZE ); - } - - if( mImpl->mEventData->mPlaceholderEllipsisFlag ) - { - map[ Text::PlaceHolder::Property::ELLIPSIS ] = IsPlaceholderTextElideEnabled(); - } - } + PlaceholderHandler::GetPlaceholderProperty(*this, map); } Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection() @@ -2487,32 +1889,32 @@ Toolkit::DevelText::TextDirection::Type Controller::GetTextDirection() // Make sure the model is up-to-date before layouting ProcessModifyEvents(); - if ( mImpl->mUpdateTextDirection ) + if(mImpl->mUpdateTextDirection) { // Operations that can be done only once until the text changes. - const OperationsMask onlyOnceOperations = static_cast( CONVERT_TO_UTF32 | - GET_SCRIPTS | - VALIDATE_FONTS | - GET_LINE_BREAKS | - BIDI_INFO | - SHAPE_TEXT | - GET_GLYPH_METRICS ); + const OperationsMask onlyOnceOperations = static_cast(CONVERT_TO_UTF32 | + GET_SCRIPTS | + VALIDATE_FONTS | + GET_LINE_BREAKS | + BIDI_INFO | + SHAPE_TEXT | + GET_GLYPH_METRICS); // Set the update info to relayout the whole text. - mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mParagraphCharacterIndex = 0u; mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); // Make sure the model is up-to-date before layouting - mImpl->UpdateModel( onlyOnceOperations ); + mImpl->UpdateModel(onlyOnceOperations); Vector3 naturalSize; - DoRelayout( Size( MAX_FLOAT, MAX_FLOAT ), - static_cast( onlyOnceOperations | - LAYOUT | REORDER | UPDATE_DIRECTION ), - naturalSize.GetVectorXY() ); + DoRelayout(Size(MAX_FLOAT, MAX_FLOAT), + static_cast(onlyOnceOperations | + LAYOUT | REORDER | UPDATE_DIRECTION), + naturalSize.GetVectorXY()); // Do not do again the only once operations. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending & ~onlyOnceOperations ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending & ~onlyOnceOperations); // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.Clear(); @@ -2531,22 +1933,22 @@ Toolkit::DevelText::VerticalLineAlignment::Type Controller::GetVerticalLineAlign return mImpl->mModel->GetVerticalLineAlignment(); } -void Controller::SetVerticalLineAlignment( Toolkit::DevelText::VerticalLineAlignment::Type alignment ) +void Controller::SetVerticalLineAlignment(Toolkit::DevelText::VerticalLineAlignment::Type alignment) { mImpl->mModel->mVerticalLineAlignment = alignment; } // public : Relayout. -Controller::UpdateTextType Controller::Relayout( const Size& size, Dali::LayoutDirection::Type layoutDirection ) +Controller::UpdateTextType Controller::Relayout(const Size& size, Dali::LayoutDirection::Type layoutDirection) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, mImpl->mIsAutoScrollEnabled ?"true":"false" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::Relayout %p size %f,%f, autoScroll[%s]\n", this, size.width, size.height, mImpl->mIsAutoScrollEnabled ? "true" : "false"); UpdateTextType updateTextType = NONE_UPDATED; - if( ( size.width < Math::MACHINE_EPSILON_1000 ) || ( size.height < Math::MACHINE_EPSILON_1000 ) ) + if((size.width < Math::MACHINE_EPSILON_1000) || (size.height < Math::MACHINE_EPSILON_1000)) { - if( 0u != mImpl->mModel->mVisualModel->mGlyphPositions.Count() ) + if(0u != mImpl->mModel->mVisualModel->mGlyphPositions.Count()) { mImpl->mModel->mVisualModel->mGlyphPositions.Clear(); updateTextType = MODEL_UPDATED; @@ -2556,95 +1958,95 @@ Controller::UpdateTextType Controller::Relayout( const Size& size, Dali::LayoutD mImpl->mTextUpdateInfo.Clear(); // Not worth to relayout if width or height is equal to zero. - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout (skipped)\n"); return updateTextType; } // Whether a new size has been set. - const bool newSize = ( size != mImpl->mModel->mVisualModel->mControlSize ); + const bool newSize = (size != mImpl->mModel->mVisualModel->mControlSize); - if( newSize ) + if(newSize) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mModel->mVisualModel->mControlSize.width, mImpl->mModel->mVisualModel->mControlSize.height ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "new size (previous size %f,%f)\n", mImpl->mModel->mVisualModel->mControlSize.width, mImpl->mModel->mVisualModel->mControlSize.height); - if( ( 0 == mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd ) && - ( 0 == mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) && - ( ( mImpl->mModel->mVisualModel->mControlSize.width < Math::MACHINE_EPSILON_1000 ) || ( mImpl->mModel->mVisualModel->mControlSize.height < Math::MACHINE_EPSILON_1000 ) ) ) + if((0 == mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd) && + (0 == mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters) && + ((mImpl->mModel->mVisualModel->mControlSize.width < Math::MACHINE_EPSILON_1000) || (mImpl->mModel->mVisualModel->mControlSize.height < Math::MACHINE_EPSILON_1000))) { mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); } // Layout operations that need to be done if the size changes. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - LAYOUT | - ALIGN | - UPDATE_LAYOUT_SIZE | - REORDER ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + LAYOUT | + ALIGN | + UPDATE_LAYOUT_SIZE | + REORDER); // Set the update info to relayout the whole text. mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; // Store the size used to layout the text. mImpl->mModel->mVisualModel->mControlSize = size; } // Whether there are modify events. - if( 0u != mImpl->mModifyEvents.Count() ) + if(0u != mImpl->mModifyEvents.Count()) { // Style operations that need to be done if the text is modified. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - COLOR ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + COLOR); } // Set the update info to elide the text. - if( mImpl->mModel->mElideEnabled || - ( ( NULL != mImpl->mEventData ) && mImpl->mEventData->mIsPlaceholderElideEnabled ) ) + if(mImpl->mModel->mElideEnabled || + ((NULL != mImpl->mEventData) && mImpl->mEventData->mIsPlaceholderElideEnabled)) { // Update Text layout for applying elided - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - ALIGN | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + ALIGN | + LAYOUT | + UPDATE_LAYOUT_SIZE | + REORDER); mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; } - if( mImpl->mModel->mMatchSystemLanguageDirection && mImpl->mLayoutDirection != layoutDirection ) + if(mImpl->mModel->mMatchSystemLanguageDirection && mImpl->mLayoutDirection != layoutDirection) { // Clear the update info. This info will be set the next time the text is updated. mImpl->mTextUpdateInfo.mClearAll = true; // Apply modifications to the model // Shape the text again is needed because characters like '()[]{}' have to be mirrored and the glyphs generated again. - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - GET_GLYPH_METRICS | - SHAPE_TEXT | - UPDATE_DIRECTION | - LAYOUT | - BIDI_INFO | - REORDER ); - mImpl->mLayoutDirection = layoutDirection; + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + GET_GLYPH_METRICS | + SHAPE_TEXT | + UPDATE_DIRECTION | + LAYOUT | + BIDI_INFO | + REORDER); + mImpl->mLayoutDirection = layoutDirection; } // Make sure the model is up-to-date before layouting. ProcessModifyEvents(); - bool updated = mImpl->UpdateModel( mImpl->mOperationsPending ); + bool updated = mImpl->UpdateModel(mImpl->mOperationsPending); // Layout the text. Size layoutSize; - updated = DoRelayout( size, - mImpl->mOperationsPending, - layoutSize ) || updated; - + updated = DoRelayout(size, + mImpl->mOperationsPending, + layoutSize) || + updated; - if( updated ) + if(updated) { updateTextType = MODEL_UPDATED; } // Do not re-do any operation until something changes. - mImpl->mOperationsPending = NO_OPERATION; + mImpl->mOperationsPending = NO_OPERATION; mImpl->mModel->mScrollPositionLast = mImpl->mModel->mScrollPosition; // Whether the text control is editable @@ -2652,779 +2054,205 @@ Controller::UpdateTextType Controller::Relayout( const Size& size, Dali::LayoutD // Keep the current offset as it will be used to update the decorator's positions (if the size changes). Vector2 offset; - if( newSize && isEditable ) + if(newSize && isEditable) { offset = mImpl->mModel->mScrollPosition; } - if( !isEditable || !IsMultiLineEnabled() ) - { - // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated. - CalculateVerticalOffset( size ); - } - - if( isEditable ) - { - 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->mModel->mScrollPosition - offset ); - } - - // Move the cursor, grab handle etc. - if( mImpl->ProcessInputEvents() ) - { - updateTextType = static_cast( updateTextType | DECORATOR_UPDATED ); - } - } - - // Clear the update info. This info will be set the next time the text is updated. - mImpl->mTextUpdateInfo.Clear(); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::Relayout\n" ); - - return updateTextType; -} - -void Controller::RequestRelayout() -{ - mImpl->RequestRelayout(); -} - -// public : Input style change signals. - -bool Controller::IsInputStyleChangedSignalsQueueEmpty() -{ - return ( NULL == mImpl->mEventData ) || ( 0u == mImpl->mEventData->mInputStyleChangedQueue.Count() ); -} - -void Controller::ProcessInputStyleChangedSignals() -{ - if( NULL == mImpl->mEventData ) - { - // Nothing to do. - return; - } - - for( Vector::ConstIterator it = mImpl->mEventData->mInputStyleChangedQueue.Begin(), - endIt = mImpl->mEventData->mInputStyleChangedQueue.End(); - it != endIt; - ++it ) - { - const InputStyle::Mask mask = *it; - - if( NULL != mImpl->mEditableControlInterface ) - { - // Emit the input style changed signal. - mImpl->mEditableControlInterface->InputStyleChanged( mask ); - } - } - - mImpl->mEventData->mInputStyleChangedQueue.Clear(); -} - -// public : Text-input Event Queuing. - -void Controller::KeyboardFocusGainEvent() -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusGainEvent" ); - - if( NULL != mImpl->mEventData ) - { - 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. - mImpl->mEventData->mUpdateInputStyle = true; - mImpl->mEventData->mScrollAfterUpdatePosition = true; - } - mImpl->NotifyInputMethodContextMultiLineStatus(); - if( mImpl->IsShowingPlaceholderText() ) - { - // Show alternative placeholder-text when editing - ShowPlaceholderText(); - } - - mImpl->RequestRelayout(); - } -} - -void Controller::KeyboardFocusLostEvent() -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyboardFocusLostEvent" ); - - if( NULL != mImpl->mEventData ) - { - if( EventData::INTERRUPTED != mImpl->mEventData->mState ) - { - mImpl->ChangeState( EventData::INACTIVE ); - - if( !mImpl->IsShowingRealText() ) - { - // Revert to regular placeholder-text when not editing - ShowPlaceholderText(); - } - } - } - mImpl->RequestRelayout(); -} - -bool Controller::KeyEvent( const Dali::KeyEvent& keyEvent ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected KeyEvent" ); - - bool textChanged = false; - bool relayoutNeeded = false; - - if( ( NULL != mImpl->mEventData ) && - ( keyEvent.state == KeyEvent::Down ) ) - { - int keyCode = keyEvent.keyCode; - const std::string& keyString = keyEvent.keyPressed; - const std::string keyName = keyEvent.keyPressedName; - - const bool isNullKey = ( 0 == keyCode ) && ( keyString.empty() ); - - // Pre-process to separate modifying events from non-modifying input events. - if( isNullKey ) - { - // In some platforms arrive key events with no key code. - // Do nothing. - return false; - } - else if( Dali::DALI_KEY_ESCAPE == keyCode || Dali::DALI_KEY_BACK == keyCode || Dali::DALI_KEY_SEARCH == keyCode ) - { - // Do nothing - return false; - } - else if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode ) || - ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode ) || - ( Dali::DALI_KEY_CURSOR_UP == keyCode ) || - ( Dali::DALI_KEY_CURSOR_DOWN == keyCode ) ) - { - // If don't have any text, do nothing. - if( !mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) - { - return false; - } - - uint32_t cursorPosition = mImpl->mEventData->mPrimaryCursorPosition; - uint32_t numberOfCharacters = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - uint32_t cursorLine = mImpl->mModel->mVisualModel->GetLineOfCharacter( cursorPosition ); - uint32_t numberOfLines = mImpl->mModel->GetNumberOfLines(); - - // Logic to determine whether this text control will lose focus or not. - if( ( Dali::DALI_KEY_CURSOR_LEFT == keyCode && 0 == cursorPosition && !keyEvent.IsShiftModifier() ) || - ( Dali::DALI_KEY_CURSOR_RIGHT == keyCode && numberOfCharacters == cursorPosition && !keyEvent.IsShiftModifier() ) || - ( Dali::DALI_KEY_CURSOR_DOWN == keyCode && cursorLine == numberOfLines -1 ) || - ( Dali::DALI_KEY_CURSOR_DOWN == keyCode && numberOfCharacters == cursorPosition && cursorLine -1 == numberOfLines -1 ) || - ( Dali::DALI_KEY_CURSOR_UP == keyCode && cursorLine == 0 ) || - ( Dali::DALI_KEY_CURSOR_UP == keyCode && numberOfCharacters == cursorPosition && cursorLine == 1 ) ) - { - // Release the active highlight. - if( mImpl->mEventData->mState == EventData::SELECTING ) - { - mImpl->ChangeState( EventData::EDITING ); - - // Update selection position. - mImpl->mEventData->mLeftSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition; - mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition; - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->RequestRelayout(); - } - return false; - } - - mImpl->mEventData->mCheckScrollAmount = true; - Event event( Event::CURSOR_KEY_EVENT ); - event.p1.mInt = keyCode; - event.p2.mBool = keyEvent.IsShiftModifier(); - mImpl->mEventData->mEventQueue.push_back( event ); - - // Will request for relayout. - relayoutNeeded = true; - } - else if ( Dali::DevelKey::DALI_KEY_CONTROL_LEFT == keyCode || Dali::DevelKey::DALI_KEY_CONTROL_RIGHT == keyCode ) - { - // Left or Right Control key event is received before Ctrl-C/V/X key event is received - // If not handle it here, any selected text will be deleted - - // Do nothing - return false; - } - else if ( keyEvent.IsCtrlModifier() ) - { - bool consumed = false; - if (keyName == KEY_C_NAME) - { - // Ctrl-C to copy the selected text - TextPopupButtonTouched( Toolkit::TextSelectionPopup::COPY ); - consumed = true; - } - else if (keyName == KEY_V_NAME) - { - // Ctrl-V to paste the copied text - TextPopupButtonTouched( Toolkit::TextSelectionPopup::PASTE ); - consumed = true; - } - else if (keyName == KEY_X_NAME) - { - // Ctrl-X to cut the selected text - TextPopupButtonTouched( Toolkit::TextSelectionPopup::CUT ); - consumed = true; - } - return consumed; - } - else if( ( Dali::DALI_KEY_BACKSPACE == keyCode ) || - ( Dali::DevelKey::DALI_KEY_DELETE == keyCode ) ) - { - textChanged = DeleteEvent( keyCode ); - - // Will request for relayout. - relayoutNeeded = true; - } - else if( IsKey( keyEvent, Dali::DALI_KEY_POWER ) || - IsKey( keyEvent, Dali::DALI_KEY_MENU ) || - IsKey( keyEvent, Dali::DALI_KEY_HOME ) ) - { - // Power key/Menu/Home key behaviour does not allow edit mode to resume. - mImpl->ChangeState( EventData::INACTIVE ); - - // Will request for relayout. - relayoutNeeded = true; - - // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text. - } - else if( ( Dali::DALI_KEY_SHIFT_LEFT == keyCode ) || ( Dali::DALI_KEY_SHIFT_RIGHT == keyCode ) ) - { - // DALI_KEY_SHIFT_LEFT or DALI_KEY_SHIFT_RIGHT is the key code for Shift. It's sent (by the InputMethodContext?) when the predictive text is enabled - // and a character is typed after the type of a upper case latin character. - - // Do nothing. - return false; - } - else if( ( Dali::DALI_KEY_VOLUME_UP == keyCode ) || ( Dali::DALI_KEY_VOLUME_DOWN == keyCode ) ) - { - // This branch avoids calling the InsertText() method of the 'else' branch which can delete selected text. - // Do nothing. - return false; - } - else - { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p keyString %s\n", this, keyString.c_str() ); - - if( !keyString.empty() ) - { - // InputMethodContext is no longer handling key-events - mImpl->ClearPreEditFlag(); - - InsertText( keyString, COMMIT ); - - textChanged = true; - - // Will request for relayout. - relayoutNeeded = true; - } - - } - - if ( ( mImpl->mEventData->mState != EventData::INTERRUPTED ) && - ( mImpl->mEventData->mState != EventData::INACTIVE ) && - ( !isNullKey ) && - ( Dali::DALI_KEY_SHIFT_LEFT != keyCode ) && - ( Dali::DALI_KEY_SHIFT_RIGHT != keyCode ) && - ( Dali::DALI_KEY_VOLUME_UP != keyCode ) && - ( Dali::DALI_KEY_VOLUME_DOWN != keyCode ) ) - { - // Should not change the state if the key is the shift send by the InputMethodContext. - // Otherwise, when the state is SELECTING the text controller can't send the right - // surrounding info to the InputMethodContext. - mImpl->ChangeState( EventData::EDITING ); - - // Will request for relayout. - relayoutNeeded = true; - } - - if( relayoutNeeded ) - { - mImpl->RequestRelayout(); - } - } - - if( textChanged && - ( NULL != mImpl->mEditableControlInterface ) ) - { - // Do this last since it provides callbacks into application code - mImpl->mEditableControlInterface->TextChanged(); - } - - return true; -} - -void Controller::TapEvent( unsigned int tapCount, float x, float y ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected TapEvent" ); - - if( NULL != mImpl->mEventData ) - { - DALI_LOG_INFO( gLogFilter, Debug::Concise, "TapEvent state:%d \n", mImpl->mEventData->mState ); - EventData::State state( mImpl->mEventData->mState ); - bool relayoutNeeded( false ); // to avoid unnecessary relayouts when tapping an empty text-field - - if( mImpl->IsClipboardVisible() ) - { - if( EventData::INACTIVE == state || EventData::EDITING == state) - { - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); - } - relayoutNeeded = true; - } - else if( 1u == tapCount ) - { - if( EventData::EDITING_WITH_POPUP == state || EventData::EDITING_WITH_PASTE_POPUP == state ) - { - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); // If Popup shown hide it here so can be shown again if required. - } - - if( mImpl->IsShowingRealText() && ( EventData::INACTIVE != state ) ) - { - mImpl->ChangeState( EventData::EDITING_WITH_GRAB_HANDLE ); - relayoutNeeded = true; - } - else - { - if( mImpl->IsShowingPlaceholderText() && !mImpl->IsFocusedPlaceholderAvailable() ) - { - // Hide placeholder text - ResetText(); - } - - if( EventData::INACTIVE == state ) - { - mImpl->ChangeState( EventData::EDITING ); - } - else if( !mImpl->IsClipboardEmpty() ) - { - mImpl->ChangeState( EventData::EDITING_WITH_POPUP ); - } - relayoutNeeded = true; - } - } - else if( 2u == tapCount ) - { - if( mImpl->mEventData->mSelectionEnabled && - mImpl->IsShowingRealText() ) - { - relayoutNeeded = true; - mImpl->mEventData->mIsLeftHandleSelected = true; - mImpl->mEventData->mIsRightHandleSelected = 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; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); - - mImpl->RequestRelayout(); - } - } - - // Reset keyboard as tap event has occurred. - mImpl->ResetInputMethodContext(); -} - -void Controller::PanEvent( Gesture::State state, const Vector2& displacement ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected PanEvent" ); - - if( NULL != mImpl->mEventData ) - { - Event event( Event::PAN_EVENT ); - event.p1.mInt = state; - event.p2.mFloat = displacement.x; - event.p3.mFloat = displacement.y; - mImpl->mEventData->mEventQueue.push_back( event ); - - mImpl->RequestRelayout(); - } -} - -void Controller::LongPressEvent( Gesture::State state, float x, float y ) -{ - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected LongPressEvent" ); - - if( ( state == Gesture::Started ) && - ( NULL != mImpl->mEventData ) ) - { - // 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 if( !mImpl->IsShowingRealText() ) - { - Event event( Event::LONG_PRESS_EVENT ); - event.p1.mInt = state; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); - mImpl->RequestRelayout(); - } - else if( !mImpl->IsClipboardVisible() ) - { - // Reset the InputMethodContext to commit the pre-edit before selecting the text. - mImpl->ResetInputMethodContext(); - - Event event( Event::LONG_PRESS_EVENT ); - event.p1.mInt = state; - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); - mImpl->RequestRelayout(); - - mImpl->mEventData->mIsLeftHandleSelected = true; - mImpl->mEventData->mIsRightHandleSelected = true; - } - } -} - -void Controller::SelectEvent( float x, float y, SelectionType selectType ) -{ - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::SelectEvent\n" ); - - if( NULL != mImpl->mEventData ) - { - if( selectType == SelectionType::ALL ) - { - Event event( Event::SELECT_ALL ); - mImpl->mEventData->mEventQueue.push_back( event ); - } - else if( selectType == SelectionType::NONE ) - { - Event event( Event::SELECT_NONE ); - mImpl->mEventData->mEventQueue.push_back( event ); - } - else - { - Event event( Event::SELECT ); - event.p2.mFloat = x; - event.p3.mFloat = y; - mImpl->mEventData->mEventQueue.push_back( event ); - } - - mImpl->mEventData->mCheckScrollAmount = true; - mImpl->mEventData->mIsLeftHandleSelected = true; - mImpl->mEventData->mIsRightHandleSelected = true; - mImpl->RequestRelayout(); - } -} - -InputMethodContext::CallbackData Controller::OnInputMethodContextEvent( InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent ) -{ - // Whether the text needs to be relaid-out. - bool requestRelayout = false; - - // Whether to retrieve the text and cursor position to be sent to the InputMethodContext. - bool retrieveText = false; - bool retrieveCursor = false; - - switch( inputMethodContextEvent.eventName ) - { - case InputMethodContext::COMMIT: - { - InsertText( inputMethodContextEvent.predictiveString, Text::Controller::COMMIT ); - requestRelayout = true; - retrieveCursor = true; - break; - } - case InputMethodContext::PRE_EDIT: - { - InsertText( inputMethodContextEvent.predictiveString, Text::Controller::PRE_EDIT ); - requestRelayout = true; - retrieveCursor = true; - break; - } - case InputMethodContext::DELETE_SURROUNDING: - { - const bool textDeleted = RemoveText( inputMethodContextEvent.cursorOffset, - inputMethodContextEvent.numberOfChars, - DONT_UPDATE_INPUT_STYLE ); - - if( textDeleted ) - { - if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) || - !mImpl->IsPlaceholderAvailable() ) - { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); - } - else - { - ShowPlaceholderText(); - } - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterDelete = true; - - requestRelayout = true; - } - break; - } - case InputMethodContext::GET_SURROUNDING: - { - retrieveText = true; - retrieveCursor = true; - break; - } - case InputMethodContext::PRIVATE_COMMAND: - { - // PRIVATECOMMAND event is just for getting the private command message - retrieveText = true; - retrieveCursor = true; - break; - } - case InputMethodContext::VOID: - { - // do nothing - break; - } - } // end switch - - if( requestRelayout ) - { - mImpl->mOperationsPending = ALL_OPERATIONS; - mImpl->RequestRelayout(); - } - - std::string text; - CharacterIndex cursorPosition = 0u; - Length numberOfWhiteSpaces = 0u; - - if( retrieveCursor ) - { - numberOfWhiteSpaces = mImpl->GetNumberOfWhiteSpaces( 0u ); - - cursorPosition = mImpl->GetLogicalCursorPosition(); - - if( cursorPosition < numberOfWhiteSpaces ) - { - cursorPosition = 0u; - } - else - { - cursorPosition -= numberOfWhiteSpaces; - } + if(!isEditable || !IsMultiLineEnabled()) + { + // After doing the text layout, the vertical offset to place the actor in the desired position can be calculated. + CalculateVerticalOffset(size); } - if( retrieveText ) + if(isEditable) { - if( !mImpl->IsShowingPlaceholderText() ) + if(newSize) { - // Retrieves the normal text string. - mImpl->GetText( numberOfWhiteSpaces, text ); + // 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->mModel->mScrollPosition - offset); } - else + + // Move the cursor, grab handle etc. + if(mImpl->ProcessInputEvents()) { - // When the current text is Placeholder Text, the surrounding text should be empty string. - // It means DALi should send empty string ("") to IME. - text = ""; + updateTextType = static_cast(updateTextType | DECORATOR_UPDATED); } } - InputMethodContext::CallbackData callbackData( ( retrieveText || retrieveCursor ), cursorPosition, text, false ); + // Clear the update info. This info will be set the next time the text is updated. + mImpl->mTextUpdateInfo.Clear(); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::Relayout\n"); - if( requestRelayout && - ( NULL != mImpl->mEditableControlInterface ) ) - { - // Do this last since it provides callbacks into application code - mImpl->mEditableControlInterface->TextChanged(); - } + return updateTextType; +} - return callbackData; +void Controller::RequestRelayout() +{ + mImpl->RequestRelayout(); } -void Controller::PasteClipboardItemEvent() +// public : Input style change signals. + +bool Controller::IsInputStyleChangedSignalsQueueEmpty() { - // Retrieve the clipboard contents first - ClipboardEventNotifier notifier( ClipboardEventNotifier::Get() ); - std::string stringToPaste( notifier.GetContent() ); + return (NULL == mImpl->mEventData) || (0u == mImpl->mEventData->mInputStyleChangedQueue.Count()); +} - // Commit the current pre-edit text; the contents of the clipboard should be appended - mImpl->ResetInputMethodContext(); +void Controller::ProcessInputStyleChangedSignals() +{ + if(NULL == mImpl->mEventData) + { + // Nothing to do. + return; + } - // Temporary disable hiding clipboard - mImpl->SetClipboardHideEnable( false ); + for(Vector::ConstIterator it = mImpl->mEventData->mInputStyleChangedQueue.Begin(), + endIt = mImpl->mEventData->mInputStyleChangedQueue.End(); + it != endIt; + ++it) + { + const InputStyle::Mask mask = *it; - // Paste - PasteText( stringToPaste ); + if(NULL != mImpl->mEditableControlInterface) + { + // Emit the input style changed signal. + mImpl->mEditableControlInterface->InputStyleChanged(mask); + } + } - mImpl->SetClipboardHideEnable( true ); + mImpl->mEventData->mInputStyleChangedQueue.Clear(); } -// protected : Inherit from Text::Decorator::ControllerInterface. +// public : Text-input Event Queuing. -void Controller::GetTargetSize( Vector2& targetSize ) +void Controller::KeyboardFocusGainEvent() { - targetSize = mImpl->mModel->mVisualModel->mControlSize; + EventHandler::KeyboardFocusGainEvent(*this); } -void Controller::AddDecoration( Actor& actor, bool needsClipping ) +void Controller::KeyboardFocusLostEvent() { - if( NULL != mImpl->mEditableControlInterface ) - { - mImpl->mEditableControlInterface->AddDecoration( actor, needsClipping ); - } + EventHandler::KeyboardFocusLostEvent(*this); } -void Controller::DecorationEvent( HandleType handleType, HandleState state, float x, float y ) +bool Controller::KeyEvent(const Dali::KeyEvent& keyEvent) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "Unexpected DecorationEvent" ); + return EventHandler::KeyEvent(*this, keyEvent); +} - if( NULL != mImpl->mEventData ) - { - switch( handleType ) - { - case GRAB_HANDLE: - { - Event event( Event::GRAB_HANDLE_EVENT ); - event.p1.mUint = state; - event.p2.mFloat = x; - event.p3.mFloat = y; +void Controller::TapEvent(unsigned int tapCount, float x, float y) +{ + EventHandler::TapEvent(*this, tapCount, x, 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; +void Controller::PanEvent(GestureState state, const Vector2& displacement) +{ + EventHandler::PanEvent(*this, state, displacement); +} - 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; +void Controller::LongPressEvent(GestureState state, float x, float y) +{ + EventHandler::LongPressEvent(*this, state, x, y); +} - 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" ); - } - } +void Controller::SelectEvent(float x, float y, SelectionType selectType) +{ + EventHandler::SelectEvent(*this, x, y, selectType); +} +void Controller::SetTextSelectionRange(const uint32_t* start, const uint32_t* end) +{ + if(mImpl->mEventData) + { + mImpl->mEventData->mCheckScrollAmount = true; + mImpl->mEventData->mIsLeftHandleSelected = true; + mImpl->mEventData->mIsRightHandleSelected = true; + mImpl->SetTextSelectionRange(start, end); mImpl->RequestRelayout(); + KeyboardFocusGainEvent(); } } -// protected : Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface. +Uint32Pair Controller::GetTextSelectionRange() const +{ + return mImpl->GetTextSelectionRange(); +} -void Controller::TextPopupButtonTouched( Dali::Toolkit::TextSelectionPopup::Buttons button ) +void Controller::SelectWholeText() { - if( NULL == mImpl->mEventData ) - { - return; - } + SelectEvent(0.f, 0.f, SelectionType::ALL); +} + +void Controller::SelectNone() +{ + SelectEvent(0.f, 0.f, SelectionType::NONE); +} - switch( button ) +string Controller::GetSelectedText() const +{ + string text; + if(EventData::SELECTING == mImpl->mEventData->mState) { - case Toolkit::TextSelectionPopup::CUT: - { - mImpl->SendSelectionToClipboard( true ); // Synchronous call to modify text - mImpl->mOperationsPending = ALL_OPERATIONS; + mImpl->RetrieveSelection(text, false); + } + return text; +} - if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) || - !mImpl->IsPlaceholderAvailable() ) - { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); - } - else - { - ShowPlaceholderText(); - } +InputMethodContext::CallbackData Controller::OnInputMethodContextEvent(InputMethodContext& inputMethodContext, const InputMethodContext::EventData& inputMethodContextEvent) +{ + return EventHandler::OnInputMethodContextEvent(*this, inputMethodContext, inputMethodContextEvent); +} - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterDelete = true; +void Controller::PasteClipboardItemEvent() +{ + EventHandler::PasteClipboardItemEvent(*this); +} - mImpl->RequestRelayout(); +// protected : Inherit from Text::Decorator::ControllerInterface. - if( NULL != mImpl->mEditableControlInterface ) - { - mImpl->mEditableControlInterface->TextChanged(); - } - break; - } - case Toolkit::TextSelectionPopup::COPY: - { - mImpl->SendSelectionToClipboard( false ); // Text not modified +void Controller::GetTargetSize(Vector2& targetSize) +{ + targetSize = mImpl->mModel->mVisualModel->mControlSize; +} - mImpl->mEventData->mUpdateCursorPosition = true; +void Controller::AddDecoration(Actor& actor, bool needsClipping) +{ + if(NULL != mImpl->mEditableControlInterface) + { + mImpl->mEditableControlInterface->AddDecoration(actor, needsClipping); + } +} - mImpl->RequestRelayout(); // Cursor, Handles, Selection Highlight, Popup - break; - } - case Toolkit::TextSelectionPopup::PASTE: - { - mImpl->RequestGetTextFromClipboard(); // Request clipboard service to retrieve an item - break; - } - case Toolkit::TextSelectionPopup::SELECT: - { - const Vector2& currentCursorPosition = mImpl->mEventData->mDecorator->GetPosition( PRIMARY_CURSOR ); +bool Controller::IsEditable() const +{ + return mImpl->IsEditable(); +} - if( mImpl->mEventData->mSelectionEnabled ) - { - // Creates a SELECT event. - SelectEvent( currentCursorPosition.x, currentCursorPosition.y, SelectionType::INTERACTIVE ); - } - break; - } - case Toolkit::TextSelectionPopup::SELECT_ALL: - { - // Creates a SELECT_ALL event - SelectEvent( 0.f, 0.f, SelectionType::ALL ); - break; - } - case Toolkit::TextSelectionPopup::CLIPBOARD: - { - mImpl->ShowClipboard(); - break; - } - case Toolkit::TextSelectionPopup::NONE: - { - // Nothing to do. - break; - } +void Controller::SetEditable(bool editable) +{ + mImpl->SetEditable(editable); + if(mImpl->mEventData && mImpl->mEventData->mDecorator) + { + mImpl->mEventData->mDecorator->SetEditable(editable); } } +void Controller::DecorationEvent(HandleType handleType, HandleState state, float x, float y) +{ + EventHandler::DecorationEvent(*this, handleType, state, x, y); +} + +// protected : Inherit from TextSelectionPopup::TextPopupButtonCallbackInterface. + +void Controller::TextPopupButtonTouched(Dali::Toolkit::TextSelectionPopup::Buttons button) +{ + EventHandler::TextPopupButtonTouched(*this, button); +} + void Controller::DisplayTimeExpired() { mImpl->mEventData->mUpdateCursorPosition = true; @@ -3436,100 +2264,104 @@ void Controller::DisplayTimeExpired() // private : Update. -void Controller::InsertText( const std::string& text, Controller::InsertType type ) +void Controller::InsertText(const std::string& text, Controller::InsertType type) { - bool removedPrevious = false; - bool removedSelected = false; + bool removedPrevious = false; + bool removedSelected = false; bool maxLengthReached = false; - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected InsertText" ) + DALI_ASSERT_DEBUG(NULL != mImpl->mEventData && "Unexpected InsertText") - if( NULL == mImpl->mEventData ) + if(NULL == mImpl->mEventData) { return; } - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", - this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), - mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Controller::InsertText %p %s (%s) mPrimaryCursorPosition %d mPreEditFlag %d mPreEditStartPosition %d mPreEditLength %d\n", this, text.c_str(), (COMMIT == type ? "COMMIT" : "PRE_EDIT"), mImpl->mEventData->mPrimaryCursorPosition, mImpl->mEventData->mPreEditFlag, mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength); + + // Play the input text with the TTS player. + Dali::TtsPlayer player = Dali::TtsPlayer::Get(Dali::TtsPlayer::SCREEN_READER); + if (player) + { + player.Play(text); + } // TODO: At the moment the underline runs are only for pre-edit. mImpl->mModel->mVisualModel->mUnderlineRuns.Clear(); // Remove the previous InputMethodContext pre-edit. - if( mImpl->mEventData->mPreEditFlag && ( 0u != mImpl->mEventData->mPreEditLength ) ) + if(mImpl->mEventData->mPreEditFlag && (0u != mImpl->mEventData->mPreEditLength)) { - removedPrevious = RemoveText( -static_cast( mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition ), - mImpl->mEventData->mPreEditLength, - DONT_UPDATE_INPUT_STYLE ); + removedPrevious = RemoveText(-static_cast(mImpl->mEventData->mPrimaryCursorPosition - mImpl->mEventData->mPreEditStartPosition), + mImpl->mEventData->mPreEditLength, + DONT_UPDATE_INPUT_STYLE); mImpl->mEventData->mPrimaryCursorPosition = mImpl->mEventData->mPreEditStartPosition; - mImpl->mEventData->mPreEditLength = 0u; + mImpl->mEventData->mPreEditLength = 0u; } else { // Remove the previous Selection. removedSelected = RemoveSelectedText(); - } Vector utf32Characters; - Length characterCount = 0u; + Length characterCount = 0u; - if( !text.empty() ) + if(!text.empty()) { // Convert text into UTF-32 - utf32Characters.Resize( text.size() ); + utf32Characters.Resize(text.size()); // This is a bit horrible but std::string returns a (signed) char* - const uint8_t* utf8 = reinterpret_cast( text.c_str() ); + const uint8_t* utf8 = reinterpret_cast(text.c_str()); // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - characterCount = Utf8ToUtf32( utf8, text.size(), utf32Characters.Begin() ); - utf32Characters.Resize( characterCount ); + characterCount = Utf8ToUtf32(utf8, text.size(), utf32Characters.Begin()); + utf32Characters.Resize(characterCount); - DALI_ASSERT_DEBUG( text.size() >= utf32Characters.Count() && "Invalid UTF32 conversion length" ); - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "UTF8 size %d, UTF32 size %d\n", text.size(), utf32Characters.Count() ); + DALI_ASSERT_DEBUG(text.size() >= utf32Characters.Count() && "Invalid UTF32 conversion length"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "UTF8 size %d, UTF32 size %d\n", text.size(), utf32Characters.Count()); } - if( 0u != utf32Characters.Count() ) // Check if Utf8ToUtf32 conversion succeeded + if(0u != utf32Characters.Count()) // Check if Utf8ToUtf32 conversion succeeded { // The placeholder text is no longer needed - if( mImpl->IsShowingPlaceholderText() ) + if(mImpl->IsShowingPlaceholderText()) { ResetText(); } - mImpl->ChangeState( EventData::EDITING ); + mImpl->ChangeState(EventData::EDITING); // Handle the InputMethodContext (predicitive text) state changes - if( COMMIT == type ) + if(COMMIT == type) { // InputMethodContext is no longer handling key-events mImpl->ClearPreEditFlag(); } else // PRE_EDIT { - if( !mImpl->mEventData->mPreEditFlag ) + if(!mImpl->mEventData->mPreEditFlag) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Entered PreEdit state\n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Entered PreEdit state\n"); // Record the start of the pre-edit text mImpl->mEventData->mPreEditStartPosition = mImpl->mEventData->mPrimaryCursorPosition; } mImpl->mEventData->mPreEditLength = utf32Characters.Count(); - mImpl->mEventData->mPreEditFlag = true; + mImpl->mEventData->mPreEditFlag = true; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "mPreEditStartPosition %d mPreEditLength %d\n", mImpl->mEventData->mPreEditStartPosition, mImpl->mEventData->mPreEditLength); } const Length numberOfCharactersInModel = mImpl->mModel->mLogicalModel->mText.Count(); // Restrict new text to fit within Maximum characters setting. - Length maxSizeOfNewText = std::min( ( mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel ), characterCount ); - maxLengthReached = ( characterCount > maxSizeOfNewText ); + Length maxSizeOfNewText = std::min((mImpl->mMaximumNumberOfCharacters - numberOfCharactersInModel), characterCount); + maxLengthReached = (characterCount > maxSizeOfNewText); // The cursor position. CharacterIndex& cursorIndex = mImpl->mEventData->mPrimaryCursorPosition; @@ -3537,136 +2369,136 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ // Update the text's style. // Updates the text style runs by adding characters. - mImpl->mModel->mLogicalModel->UpdateTextStyleRuns( cursorIndex, maxSizeOfNewText ); + mImpl->mModel->mLogicalModel->UpdateTextStyleRuns(cursorIndex, maxSizeOfNewText); // Get the character index from the cursor index. - const CharacterIndex styleIndex = ( cursorIndex > 0u ) ? cursorIndex - 1u : 0u; + const CharacterIndex styleIndex = (cursorIndex > 0u) ? cursorIndex - 1u : 0u; // Retrieve the text's style for the given index. InputStyle style; - mImpl->RetrieveDefaultInputStyle( style ); - mImpl->mModel->mLogicalModel->RetrieveStyle( styleIndex, style ); + mImpl->RetrieveDefaultInputStyle(style); + mImpl->mModel->mLogicalModel->RetrieveStyle(styleIndex, style); // Whether to add a new text color run. - const bool addColorRun = ( style.textColor != mImpl->mEventData->mInputStyle.textColor ) && !mImpl->mEventData->mInputStyle.isDefaultColor; + const bool addColorRun = (style.textColor != mImpl->mEventData->mInputStyle.textColor) && !mImpl->mEventData->mInputStyle.isDefaultColor; // Whether to add a new font run. - const bool addFontNameRun = ( style.familyName != mImpl->mEventData->mInputStyle.familyName ) && mImpl->mEventData->mInputStyle.isFamilyDefined; - const bool addFontWeightRun = ( style.weight != mImpl->mEventData->mInputStyle.weight ) && mImpl->mEventData->mInputStyle.isWeightDefined; - const bool addFontWidthRun = ( style.width != mImpl->mEventData->mInputStyle.width ) && mImpl->mEventData->mInputStyle.isWidthDefined; - const bool addFontSlantRun = ( style.slant != mImpl->mEventData->mInputStyle.slant ) && mImpl->mEventData->mInputStyle.isSlantDefined; - const bool addFontSizeRun = ( style.size != mImpl->mEventData->mInputStyle.size ) && mImpl->mEventData->mInputStyle.isSizeDefined ; + const bool addFontNameRun = (style.familyName != mImpl->mEventData->mInputStyle.familyName) && mImpl->mEventData->mInputStyle.isFamilyDefined; + const bool addFontWeightRun = (style.weight != mImpl->mEventData->mInputStyle.weight) && mImpl->mEventData->mInputStyle.isWeightDefined; + const bool addFontWidthRun = (style.width != mImpl->mEventData->mInputStyle.width) && mImpl->mEventData->mInputStyle.isWidthDefined; + const bool addFontSlantRun = (style.slant != mImpl->mEventData->mInputStyle.slant) && mImpl->mEventData->mInputStyle.isSlantDefined; + const bool addFontSizeRun = (style.size != mImpl->mEventData->mInputStyle.size) && mImpl->mEventData->mInputStyle.isSizeDefined; // Add style runs. - if( addColorRun ) + if(addColorRun) { const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mColorRuns.Count(); - mImpl->mModel->mLogicalModel->mColorRuns.Resize( numberOfRuns + 1u ); + mImpl->mModel->mLogicalModel->mColorRuns.Resize(numberOfRuns + 1u); - ColorRun& colorRun = *( mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns ); - colorRun.color = mImpl->mEventData->mInputStyle.textColor; - colorRun.characterRun.characterIndex = cursorIndex; + ColorRun& colorRun = *(mImpl->mModel->mLogicalModel->mColorRuns.Begin() + numberOfRuns); + colorRun.color = mImpl->mEventData->mInputStyle.textColor; + colorRun.characterRun.characterIndex = cursorIndex; colorRun.characterRun.numberOfCharacters = maxSizeOfNewText; } - if( addFontNameRun || - addFontWeightRun || - addFontWidthRun || - addFontSlantRun || - addFontSizeRun ) + if(addFontNameRun || + addFontWeightRun || + addFontWidthRun || + addFontSlantRun || + addFontSizeRun) { const VectorBase::SizeType numberOfRuns = mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Count(); - mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Resize( numberOfRuns + 1u ); + mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Resize(numberOfRuns + 1u); - FontDescriptionRun& fontDescriptionRun = *( mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Begin() + numberOfRuns ); + FontDescriptionRun& fontDescriptionRun = *(mImpl->mModel->mLogicalModel->mFontDescriptionRuns.Begin() + numberOfRuns); - if( addFontNameRun ) + if(addFontNameRun) { fontDescriptionRun.familyLength = mImpl->mEventData->mInputStyle.familyName.size(); - fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; - memcpy( fontDescriptionRun.familyName, mImpl->mEventData->mInputStyle.familyName.c_str(), fontDescriptionRun.familyLength ); + fontDescriptionRun.familyName = new char[fontDescriptionRun.familyLength]; + memcpy(fontDescriptionRun.familyName, mImpl->mEventData->mInputStyle.familyName.c_str(), fontDescriptionRun.familyLength); fontDescriptionRun.familyDefined = true; // The memory allocated for the font family name is freed when the font description is removed from the logical model. } - if( addFontWeightRun ) + if(addFontWeightRun) { - fontDescriptionRun.weight = mImpl->mEventData->mInputStyle.weight; + fontDescriptionRun.weight = mImpl->mEventData->mInputStyle.weight; fontDescriptionRun.weightDefined = true; } - if( addFontWidthRun ) + if(addFontWidthRun) { - fontDescriptionRun.width = mImpl->mEventData->mInputStyle.width; + fontDescriptionRun.width = mImpl->mEventData->mInputStyle.width; fontDescriptionRun.widthDefined = true; } - if( addFontSlantRun ) + if(addFontSlantRun) { - fontDescriptionRun.slant = mImpl->mEventData->mInputStyle.slant; + fontDescriptionRun.slant = mImpl->mEventData->mInputStyle.slant; fontDescriptionRun.slantDefined = true; } - if( addFontSizeRun ) + if(addFontSizeRun) { - fontDescriptionRun.size = static_cast( mImpl->mEventData->mInputStyle.size * 64.f ); + fontDescriptionRun.size = static_cast(mImpl->mEventData->mInputStyle.size * 64.f); fontDescriptionRun.sizeDefined = true; } - fontDescriptionRun.characterRun.characterIndex = cursorIndex; + fontDescriptionRun.characterRun.characterIndex = cursorIndex; fontDescriptionRun.characterRun.numberOfCharacters = maxSizeOfNewText; } // Insert at current cursor position. Vector& modifyText = mImpl->mModel->mLogicalModel->mText; - if( cursorIndex < numberOfCharactersInModel ) + if(cursorIndex < numberOfCharactersInModel) { - modifyText.Insert( modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText ); + modifyText.Insert(modifyText.Begin() + cursorIndex, utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText); } else { - modifyText.Insert( modifyText.End(), utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText ); + modifyText.Insert(modifyText.End(), utf32Characters.Begin(), utf32Characters.Begin() + maxSizeOfNewText); } // Mark the first paragraph to be updated. - if( Layout::Engine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout() ) + if(Layout::Engine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout()) { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mCharacterIndex = 0; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = numberOfCharactersInModel + maxSizeOfNewText; - mImpl->mTextUpdateInfo.mClearAll = true; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = numberOfCharactersInModel + maxSizeOfNewText; + mImpl->mTextUpdateInfo.mClearAll = true; } else { - mImpl->mTextUpdateInfo.mCharacterIndex = std::min( cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex ); + mImpl->mTextUpdateInfo.mCharacterIndex = std::min(cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex); mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd += maxSizeOfNewText; } // Update the cursor index. cursorIndex += maxSizeOfNewText; - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mModel->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "Inserted %d characters, new size %d new cursor %d\n", maxSizeOfNewText, mImpl->mModel->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition); } - if( ( 0u == mImpl->mModel->mLogicalModel->mText.Count() ) && - mImpl->IsPlaceholderAvailable() ) + if((0u == mImpl->mModel->mLogicalModel->mText.Count()) && + mImpl->IsPlaceholderAvailable()) { // Show place-holder if empty after removing the pre-edit text ShowPlaceholderText(); mImpl->mEventData->mUpdateCursorPosition = true; mImpl->ClearPreEditFlag(); } - else if( removedPrevious || - removedSelected || - ( 0 != utf32Characters.Count() ) ) + else if(removedPrevious || + removedSelected || + (0 != utf32Characters.Count())) { // Queue an inserted event - mImpl->QueueModifyEvent( ModifyEvent::TEXT_INSERTED ); + mImpl->QueueModifyEvent(ModifyEvent::TEXT_INSERTED); mImpl->mEventData->mUpdateCursorPosition = true; - if( removedSelected ) + if(removedSelected) { mImpl->mEventData->mScrollAfterDelete = true; } @@ -3676,13 +2508,13 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ } } - if( maxLengthReached ) + if(maxLengthReached) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mModel->mLogicalModel->mText.Count() ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "MaxLengthReached (%d)\n", mImpl->mModel->mLogicalModel->mText.Count()); mImpl->ResetInputMethodContext(); - if( NULL != mImpl->mEditableControlInterface ) + if(NULL != mImpl->mEditableControlInterface) { // Do this last since it provides callbacks into application code mImpl->mEditableControlInterface->MaxLengthReached(); @@ -3690,121 +2522,128 @@ void Controller::InsertText( const std::string& text, Controller::InsertType typ } } -void Controller::PasteText( const std::string& stringToPaste ) +void Controller::PasteText(const std::string& stringToPaste) { - InsertText( stringToPaste, Text::Controller::COMMIT ); - mImpl->ChangeState( EventData::EDITING ); + InsertText(stringToPaste, Text::Controller::COMMIT); + mImpl->ChangeState(EventData::EDITING); mImpl->RequestRelayout(); - if( NULL != mImpl->mEditableControlInterface ) + if(NULL != mImpl->mEditableControlInterface) { // Do this last since it provides callbacks into application code - mImpl->mEditableControlInterface->TextChanged(); + mImpl->mEditableControlInterface->TextChanged(true); } } -bool Controller::RemoveText( int cursorOffset, - int numberOfCharacters, - UpdateInputStyleType type ) +bool Controller::RemoveText(int cursorOffset, + int numberOfCharacters, + UpdateInputStyleType type) { bool removed = false; + bool removeAll = false; - if( NULL == mImpl->mEventData ) + if(NULL == mImpl->mEventData) { return removed; } - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", - this, mImpl->mModel->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters ); + DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveText %p mText.Count() %d cursor %d cursorOffset %d numberOfCharacters %d\n", this, mImpl->mModel->mLogicalModel->mText.Count(), mImpl->mEventData->mPrimaryCursorPosition, cursorOffset, numberOfCharacters); - if( !mImpl->IsShowingPlaceholderText() ) + if(!mImpl->IsShowingPlaceholderText()) { // Delete at current cursor position - Vector& currentText = mImpl->mModel->mLogicalModel->mText; - CharacterIndex& oldCursorIndex = mImpl->mEventData->mPrimaryCursorPosition; + Vector& currentText = mImpl->mModel->mLogicalModel->mText; + CharacterIndex& oldCursorIndex = mImpl->mEventData->mPrimaryCursorPosition; CharacterIndex cursorIndex = 0; // Validate the cursor position & number of characters - if( ( static_cast< int >( mImpl->mEventData->mPrimaryCursorPosition ) + cursorOffset ) >= 0 ) + if((static_cast(mImpl->mEventData->mPrimaryCursorPosition) + cursorOffset) >= 0) { cursorIndex = mImpl->mEventData->mPrimaryCursorPosition + cursorOffset; } - if( ( cursorIndex + numberOfCharacters ) > currentText.Count() ) + if((cursorIndex + numberOfCharacters) > currentText.Count()) { numberOfCharacters = currentText.Count() - cursorIndex; } - if( mImpl->mEventData->mPreEditFlag || // If the preedit flag is enabled, it means two (or more) of them came together i.e. when two keys have been pressed at the same time. - ( ( cursorIndex + numberOfCharacters ) <= mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters ) ) + if((cursorIndex == 0) && (currentText.Count() - numberOfCharacters == 0)) + { + removeAll = true; + } + + if(mImpl->mEventData->mPreEditFlag || removeAll || // If the preedit flag is enabled, it means two (or more) of them came together i.e. when two keys have been pressed at the same time. + ((cursorIndex + numberOfCharacters) <= mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters)) { // Mark the paragraphs to be updated. - if( Layout::Engine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout() ) + if(Layout::Engine::SINGLE_LINE_BOX == mImpl->mLayoutEngine.GetLayout()) { - mImpl->mTextUpdateInfo.mCharacterIndex = 0; + mImpl->mTextUpdateInfo.mCharacterIndex = 0; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters - numberOfCharacters; - mImpl->mTextUpdateInfo.mClearAll = true; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters - numberOfCharacters; + mImpl->mTextUpdateInfo.mClearAll = true; } else { - mImpl->mTextUpdateInfo.mCharacterIndex = std::min( cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex ); + mImpl->mTextUpdateInfo.mCharacterIndex = std::min(cursorIndex, mImpl->mTextUpdateInfo.mCharacterIndex); mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove += numberOfCharacters; } // Update the input style and remove the text's style before removing the text. - if( UPDATE_INPUT_STYLE == type ) + if(UPDATE_INPUT_STYLE == type) { // Keep a copy of the current input style. InputStyle currentInputStyle; - currentInputStyle.Copy( mImpl->mEventData->mInputStyle ); + currentInputStyle.Copy(mImpl->mEventData->mInputStyle); // Set first the default input style. - mImpl->RetrieveDefaultInputStyle( mImpl->mEventData->mInputStyle ); + mImpl->RetrieveDefaultInputStyle(mImpl->mEventData->mInputStyle); // Update the input style. - mImpl->mModel->mLogicalModel->RetrieveStyle( cursorIndex, mImpl->mEventData->mInputStyle ); + mImpl->mModel->mLogicalModel->RetrieveStyle(cursorIndex, mImpl->mEventData->mInputStyle); // Compare if the input style has changed. - const bool hasInputStyleChanged = !currentInputStyle.Equal( mImpl->mEventData->mInputStyle ); + const bool hasInputStyleChanged = !currentInputStyle.Equal(mImpl->mEventData->mInputStyle); - if( hasInputStyleChanged ) + if(hasInputStyleChanged) { - const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask( mImpl->mEventData->mInputStyle ); + const InputStyle::Mask styleChangedMask = currentInputStyle.GetInputStyleChangeMask(mImpl->mEventData->mInputStyle); // Queue the input style changed signal. - mImpl->mEventData->mInputStyleChangedQueue.PushBack( styleChangedMask ); + mImpl->mEventData->mInputStyleChangedQueue.PushBack(styleChangedMask); } } // If the number of current text and the number of characters to be deleted are same, // it means all texts should be removed and all Preedit variables should be initialized. - if( ( currentText.Count() - numberOfCharacters == 0 ) && ( cursorIndex == 0 ) ) + if(removeAll) { mImpl->ClearPreEditFlag(); + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0; } // Updates the text style runs by removing characters. Runs with no characters are removed. - mImpl->mModel->mLogicalModel->UpdateTextStyleRuns( cursorIndex, -numberOfCharacters ); + mImpl->mModel->mLogicalModel->UpdateTextStyleRuns(cursorIndex, -numberOfCharacters); // Remove the characters. Vector::Iterator first = currentText.Begin() + cursorIndex; Vector::Iterator last = first + numberOfCharacters; - currentText.Erase( first, last ); + currentText.Erase(first, last); // Cursor position retreat oldCursorIndex = cursorIndex; mImpl->mEventData->mScrollAfterDelete = true; - if( EventData::INACTIVE == mImpl->mEventData->mState ) + if(EventData::INACTIVE == mImpl->mEventData->mState) { - mImpl->ChangeState( EventData::EDITING ); + mImpl->ChangeState(EventData::EDITING); } - DALI_LOG_INFO( gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters ); + DALI_LOG_INFO(gLogFilter, Debug::General, "Controller::RemoveText %p removed %d\n", this, numberOfCharacters); + removeAll = false; removed = true; } } @@ -3814,134 +2653,124 @@ bool Controller::RemoveText( int cursorOffset, bool Controller::RemoveSelectedText() { - bool textRemoved( false ); + bool textRemoved(false); - if( EventData::SELECTING == mImpl->mEventData->mState ) + if(EventData::SELECTING == mImpl->mEventData->mState) { std::string removedString; - mImpl->RetrieveSelection( removedString, true ); + mImpl->RetrieveSelection(removedString, true); - if( !removedString.empty() ) + if(!removedString.empty()) { textRemoved = true; - mImpl->ChangeState( EventData::EDITING ); + mImpl->ChangeState(EventData::EDITING); } } return textRemoved; } -std::string Controller::GetSelectedText() -{ - std::string text; - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - mImpl->RetrieveSelection( text, false ); - } - return text; -} - // private : Relayout. -bool Controller::DoRelayout( const Size& size, - OperationsMask operationsRequired, - Size& layoutSize ) +bool Controller::DoRelayout(const Size& size, + OperationsMask operationsRequired, + Size& layoutSize) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", this, size.width, size.height ); - bool viewUpdated( false ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::DoRelayout %p size %f,%f\n", this, size.width, size.height); + bool viewUpdated(false); // Calculate the operations to be done. - const OperationsMask operations = static_cast( mImpl->mOperationsPending & operationsRequired ); + const OperationsMask operations = static_cast(mImpl->mOperationsPending & operationsRequired); - const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; - const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; + const CharacterIndex startIndex = mImpl->mTextUpdateInfo.mParagraphCharacterIndex; + const Length requestedNumberOfCharacters = mImpl->mTextUpdateInfo.mRequestedNumberOfCharacters; // Get the current layout size. layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); - if( NO_OPERATION != ( LAYOUT & operations ) ) + if(NO_OPERATION != (LAYOUT & operations)) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n"); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "-->Controller::DoRelayout LAYOUT & operations\n"); // Some vectors with data needed to layout and reorder may be void // after the first time the text has been laid out. // Fill the vectors again. // Calculate the number of glyphs to layout. - const Vector& charactersToGlyph = mImpl->mModel->mVisualModel->mCharactersToGlyph; - const Vector& glyphsPerCharacter = mImpl->mModel->mVisualModel->mGlyphsPerCharacter; - const GlyphIndex* const charactersToGlyphBuffer = charactersToGlyph.Begin(); - const Length* const glyphsPerCharacterBuffer = glyphsPerCharacter.Begin(); + const Vector& charactersToGlyph = mImpl->mModel->mVisualModel->mCharactersToGlyph; + const Vector& glyphsPerCharacter = mImpl->mModel->mVisualModel->mGlyphsPerCharacter; + const GlyphIndex* const charactersToGlyphBuffer = charactersToGlyph.Begin(); + const Length* const glyphsPerCharacterBuffer = glyphsPerCharacter.Begin(); - const CharacterIndex lastIndex = startIndex + ( ( requestedNumberOfCharacters > 0u ) ? requestedNumberOfCharacters - 1u : 0u ); - const GlyphIndex startGlyphIndex = mImpl->mTextUpdateInfo.mStartGlyphIndex; + const CharacterIndex lastIndex = startIndex + ((requestedNumberOfCharacters > 0u) ? requestedNumberOfCharacters - 1u : 0u); + const GlyphIndex startGlyphIndex = mImpl->mTextUpdateInfo.mStartGlyphIndex; // Make sure the index is not out of bound - if ( charactersToGlyph.Count() != glyphsPerCharacter.Count() || - requestedNumberOfCharacters > charactersToGlyph.Count() || - ( lastIndex > charactersToGlyph.Count() && charactersToGlyph.Count() > 0u ) ) + if(charactersToGlyph.Count() != glyphsPerCharacter.Count() || + requestedNumberOfCharacters > charactersToGlyph.Count() || + (lastIndex > charactersToGlyph.Count() && charactersToGlyph.Count() > 0u)) { std::string currentText; - GetText( currentText ); + GetText(currentText); - DALI_LOG_ERROR( "Controller::DoRelayout: Attempting to access invalid buffer\n" ); - DALI_LOG_ERROR( "Current text is: %s\n", currentText.c_str() ); - DALI_LOG_ERROR( "startIndex: %u, lastIndex: %u, requestedNumberOfCharacters: %u, charactersToGlyph.Count = %lu, glyphsPerCharacter.Count = %lu\n", startIndex, lastIndex, requestedNumberOfCharacters, charactersToGlyph.Count(), glyphsPerCharacter.Count()); + DALI_LOG_ERROR("Controller::DoRelayout: Attempting to access invalid buffer\n"); + DALI_LOG_ERROR("Current text is: %s\n", currentText.c_str()); + DALI_LOG_ERROR("startIndex: %u, lastIndex: %u, requestedNumberOfCharacters: %u, charactersToGlyph.Count = %lu, glyphsPerCharacter.Count = %lu\n", startIndex, lastIndex, requestedNumberOfCharacters, charactersToGlyph.Count(), glyphsPerCharacter.Count()); return false; } - const Length numberOfGlyphs = ( requestedNumberOfCharacters > 0u ) ? *( charactersToGlyphBuffer + lastIndex ) + *( glyphsPerCharacterBuffer + lastIndex ) - startGlyphIndex : 0u; + const Length numberOfGlyphs = (requestedNumberOfCharacters > 0u) ? *(charactersToGlyphBuffer + lastIndex) + *(glyphsPerCharacterBuffer + lastIndex) - startGlyphIndex : 0u; const Length totalNumberOfGlyphs = mImpl->mModel->mVisualModel->mGlyphs.Count(); - if( 0u == totalNumberOfGlyphs ) + if(0u == totalNumberOfGlyphs) { - if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) ) + if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations)) { - mImpl->mModel->mVisualModel->SetLayoutSize( Size::ZERO ); + mImpl->mModel->mVisualModel->SetLayoutSize(Size::ZERO); } // Nothing else to do if there is no glyphs. - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n" ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout no glyphs, view updated true\n"); return true; } // Set the layout parameters. - Layout::Parameters layoutParameters( size, - mImpl->mModel); + Layout::Parameters layoutParameters(size, + mImpl->mModel); // Resize the vector of positions to have the same size than the vector of glyphs. Vector& glyphPositions = mImpl->mModel->mVisualModel->mGlyphPositions; - glyphPositions.Resize( totalNumberOfGlyphs ); + glyphPositions.Resize(totalNumberOfGlyphs); // Whether the last character is a new paragraph character. - const Character* const textBuffer = mImpl->mModel->mLogicalModel->mText.Begin(); - mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph( *( textBuffer + ( mImpl->mModel->mLogicalModel->mText.Count() - 1u ) ) ); - layoutParameters.isLastNewParagraph = mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph; + const Character* const textBuffer = mImpl->mModel->mLogicalModel->mText.Begin(); + mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph = TextAbstraction::IsNewParagraph(*(textBuffer + (mImpl->mModel->mLogicalModel->mText.Count() - 1u))); + layoutParameters.isLastNewParagraph = mImpl->mTextUpdateInfo.mIsLastCharacterNewParagraph; // The initial glyph and the number of glyphs to layout. - layoutParameters.startGlyphIndex = startGlyphIndex; - layoutParameters.numberOfGlyphs = numberOfGlyphs; - layoutParameters.startLineIndex = mImpl->mTextUpdateInfo.mStartLineIndex; + layoutParameters.startGlyphIndex = startGlyphIndex; + layoutParameters.numberOfGlyphs = numberOfGlyphs; + layoutParameters.startLineIndex = mImpl->mTextUpdateInfo.mStartLineIndex; layoutParameters.estimatedNumberOfLines = mImpl->mTextUpdateInfo.mEstimatedNumberOfLines; // Update the ellipsis bool elideTextEnabled = mImpl->mModel->mElideEnabled; - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { - if( mImpl->mEventData->mPlaceholderEllipsisFlag && mImpl->IsShowingPlaceholderText() ) + if(mImpl->mEventData->mPlaceholderEllipsisFlag && mImpl->IsShowingPlaceholderText()) { elideTextEnabled = mImpl->mEventData->mIsPlaceholderElideEnabled; } - else if( EventData::INACTIVE != mImpl->mEventData->mState ) + else if(EventData::INACTIVE != mImpl->mEventData->mState) { // Disable ellipsis when editing elideTextEnabled = false; } // Reset the scroll position in inactive state - if( elideTextEnabled && ( mImpl->mEventData->mState == EventData::INACTIVE ) ) + if(elideTextEnabled && (mImpl->mEventData->mState == EventData::INACTIVE)) { ResetScrollPosition(); } @@ -3950,262 +2779,160 @@ bool Controller::DoRelayout( const Size& size, // Update the visual model. bool isAutoScrollEnabled = mImpl->mIsAutoScrollEnabled; Size newLayoutSize; - viewUpdated = mImpl->mLayoutEngine.LayoutText( layoutParameters, - newLayoutSize, - elideTextEnabled, - isAutoScrollEnabled ); + viewUpdated = mImpl->mLayoutEngine.LayoutText(layoutParameters, + newLayoutSize, + elideTextEnabled, + isAutoScrollEnabled); mImpl->mIsAutoScrollEnabled = isAutoScrollEnabled; - viewUpdated = viewUpdated || ( newLayoutSize != layoutSize ); + viewUpdated = viewUpdated || (newLayoutSize != layoutSize); - if( viewUpdated ) + if(viewUpdated) { layoutSize = newLayoutSize; - if( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) + if(NO_OPERATION != (UPDATE_DIRECTION & operations)) { mImpl->mIsTextDirectionRTL = false; } - if ( ( NO_OPERATION != ( UPDATE_DIRECTION & operations ) ) && !mImpl->mModel->mVisualModel->mLines.Empty() ) + if((NO_OPERATION != (UPDATE_DIRECTION & operations)) && !mImpl->mModel->mVisualModel->mLines.Empty()) { mImpl->mIsTextDirectionRTL = mImpl->mModel->mVisualModel->mLines[0u].direction; } // Sets the layout size. - if( NO_OPERATION != ( UPDATE_LAYOUT_SIZE & operations ) ) + if(NO_OPERATION != (UPDATE_LAYOUT_SIZE & operations)) { - mImpl->mModel->mVisualModel->SetLayoutSize( layoutSize ); + mImpl->mModel->mVisualModel->SetLayoutSize(layoutSize); } } // view updated } - if( NO_OPERATION != ( ALIGN & operations ) ) + if(NO_OPERATION != (ALIGN & operations)) { // The laid-out lines. Vector& lines = mImpl->mModel->mVisualModel->mLines; - CharacterIndex alignStartIndex = startIndex; - Length alignRequestedNumberOfCharacters = requestedNumberOfCharacters; + CharacterIndex alignStartIndex = startIndex; + Length alignRequestedNumberOfCharacters = requestedNumberOfCharacters; // the whole text needs to be full aligned. // If you do not do a full aligned, only the last line of the multiline input is aligned. - if( mImpl->mEventData && mImpl->mEventData->mUpdateAlignment ) + if(mImpl->mEventData && mImpl->mEventData->mUpdateAlignment) { - alignStartIndex = 0u; - alignRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); + alignStartIndex = 0u; + alignRequestedNumberOfCharacters = mImpl->mModel->mLogicalModel->mText.Count(); mImpl->mEventData->mUpdateAlignment = false; } // Need to align with the control's size as the text may contain lines // starting either with left to right text or right to left. - mImpl->mLayoutEngine.Align( size, - alignStartIndex, - alignRequestedNumberOfCharacters, - mImpl->mModel->mHorizontalAlignment, - lines, - mImpl->mModel->mAlignmentOffset, - mImpl->mLayoutDirection, - mImpl->mModel->mMatchSystemLanguageDirection ); + mImpl->mLayoutEngine.Align(size, + alignStartIndex, + alignRequestedNumberOfCharacters, + mImpl->mModel->mHorizontalAlignment, + lines, + mImpl->mModel->mAlignmentOffset, + mImpl->mLayoutDirection, + mImpl->mModel->mMatchSystemLanguageDirection); viewUpdated = true; } #if defined(DEBUG_ENABLED) std::string currentText; - GetText( currentText ); - DALI_LOG_INFO( gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", this, (mImpl->mIsTextDirectionRTL)?"true":"false", currentText.c_str() ); + GetText(currentText); + DALI_LOG_INFO(gLogFilter, Debug::Concise, "Controller::DoRelayout [%p] mImpl->mIsTextDirectionRTL[%s] [%s]\n", this, (mImpl->mIsTextDirectionRTL) ? "true" : "false", currentText.c_str()); #endif - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", ( viewUpdated ? "true" : "false" ) ); + DALI_LOG_INFO(gLogFilter, Debug::Verbose, "<--Controller::DoRelayout, view updated %s\n", (viewUpdated ? "true" : "false")); return viewUpdated; } -void Controller::CalculateVerticalOffset( const Size& controlSize ) +void Controller::CalculateVerticalOffset(const Size& controlSize) { - Size layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); + ModelPtr& model = mImpl->mModel; + VisualModelPtr& visualModel = model->mVisualModel; + Size layoutSize = mImpl->mModel->mVisualModel->GetLayoutSize(); + Size oldLayoutSize = layoutSize; + float offsetY = 0.f; + bool needRecalc = false; + float defaultFontLineHeight = mImpl->GetDefaultFontLineHeight(); - if( fabsf( layoutSize.height ) < Math::MACHINE_EPSILON_1000 ) + if(fabsf(layoutSize.height) < Math::MACHINE_EPSILON_1000) { // Get the line height of the default font. - layoutSize.height = mImpl->GetDefaultFontLineHeight(); + layoutSize.height = defaultFontLineHeight; + } + + // Whether the text control is editable + const bool isEditable = NULL != mImpl->mEventData; + if(isEditable && layoutSize.height != defaultFontLineHeight) + { + // This code prevents the wrong positioning of cursor when the layout size is bigger/smaller than defaultFontLineHeight. + // This situation occurs when the size of placeholder text is different from the default text. + layoutSize.height = defaultFontLineHeight; + needRecalc = true; } - switch( mImpl->mModel->mVerticalAlignment ) + switch(mImpl->mModel->mVerticalAlignment) { case VerticalAlignment::TOP: { mImpl->mModel->mScrollPosition.y = 0.f; + offsetY = 0.f; break; } case VerticalAlignment::CENTER: { - mImpl->mModel->mScrollPosition.y = floorf( 0.5f * ( controlSize.height - layoutSize.height ) ); // try to avoid pixel alignment. + mImpl->mModel->mScrollPosition.y = floorf(0.5f * (controlSize.height - layoutSize.height)); // try to avoid pixel alignment. + if(needRecalc) offsetY = floorf(0.5f * (layoutSize.height - oldLayoutSize.height)); break; } case VerticalAlignment::BOTTOM: { mImpl->mModel->mScrollPosition.y = controlSize.height - layoutSize.height; + if(needRecalc) offsetY = layoutSize.height - oldLayoutSize.height; break; } } -} - -// private : Events. - -void Controller::ProcessModifyEvents() -{ - Vector& events = mImpl->mModifyEvents; - - if( 0u == events.Count() ) - { - // Nothing to do. - return; - } - for( Vector::ConstIterator it = events.Begin(), - endIt = events.End(); - it != endIt; - ++it ) + if(needRecalc) { - const ModifyEvent& event = *it; - - if( ModifyEvent::TEXT_REPLACED == event.type ) - { - // A (single) replace event should come first, otherwise we wasted time processing NOOP events - DALI_ASSERT_DEBUG( it == events.Begin() && "Unexpected TEXT_REPLACED event" ); - - TextReplacedEvent(); - } - else if( ModifyEvent::TEXT_INSERTED == event.type ) + // Update glyphPositions according to recalculation. + const Length positionCount = visualModel->mGlyphPositions.Count(); + Vector& glyphPositions = visualModel->mGlyphPositions; + for(Length index = 0u; index < positionCount; index++) { - TextInsertedEvent(); - } - else if( ModifyEvent::TEXT_DELETED == event.type ) - { - // Placeholder-text cannot be deleted - if( !mImpl->IsShowingPlaceholderText() ) - { - TextDeletedEvent(); - } + glyphPositions[index].y += offsetY; } } +} - if( NULL != mImpl->mEventData ) - { - // When the text is being modified, delay cursor blinking - mImpl->mEventData->mDecorator->DelayCursorBlink(); - - // Update selection position after modifying the text - mImpl->mEventData->mLeftSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition; - mImpl->mEventData->mRightSelectionPosition = mImpl->mEventData->mPrimaryCursorPosition; - } +// private : Events. - // Discard temporary text - events.Clear(); +void Controller::ProcessModifyEvents() +{ + EventHandler::ProcessModifyEvents(*this); } void Controller::TextReplacedEvent() { - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; - - // The text direction needs to be updated. - mImpl->mUpdateTextDirection = true; - - // Apply modifications to the model - mImpl->mOperationsPending = ALL_OPERATIONS; + EventHandler::TextReplacedEvent(*this); } void Controller::TextInsertedEvent() { - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextInsertedEvent" ); - - if( NULL == mImpl->mEventData ) - { - return; - } - - mImpl->mEventData->mCheckScrollAmount = true; - - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; - - // The text direction needs to be updated. - mImpl->mUpdateTextDirection = true; - - // Apply modifications to the model; TODO - Optimize this - mImpl->mOperationsPending = ALL_OPERATIONS; + EventHandler::TextInsertedEvent(*this); } void Controller::TextDeletedEvent() { - DALI_ASSERT_DEBUG( NULL != mImpl->mEventData && "Unexpected TextDeletedEvent" ); - - if( NULL == mImpl->mEventData ) - { - return; - } - - mImpl->mEventData->mCheckScrollAmount = true; - - // The natural size needs to be re-calculated. - mImpl->mRecalculateNaturalSize = true; - - // The text direction needs to be updated. - mImpl->mUpdateTextDirection = true; - - // Apply modifications to the model; TODO - Optimize this - mImpl->mOperationsPending = ALL_OPERATIONS; + EventHandler::TextDeletedEvent(*this); } -bool Controller::DeleteEvent( int keyCode ) +bool Controller::DeleteEvent(int keyCode) { - DALI_LOG_INFO( gLogFilter, Debug::Verbose, "Controller::KeyEvent %p KeyCode : %d \n", this, keyCode ); - - bool removed = false; - - if( NULL == mImpl->mEventData ) - { - return removed; - } - - // InputMethodContext is no longer handling key-events - mImpl->ClearPreEditFlag(); - - if( EventData::SELECTING == mImpl->mEventData->mState ) - { - removed = RemoveSelectedText(); - } - else if( ( mImpl->mEventData->mPrimaryCursorPosition > 0 ) && ( keyCode == Dali::DALI_KEY_BACKSPACE) ) - { - // Remove the character before the current cursor position - removed = RemoveText( -1, - 1, - UPDATE_INPUT_STYLE ); - } - else if( keyCode == Dali::DevelKey::DALI_KEY_DELETE ) - { - // Remove the character after the current cursor position - removed = RemoveText( 0, - 1, - UPDATE_INPUT_STYLE ); - } - - if( removed ) - { - if( ( 0u != mImpl->mModel->mLogicalModel->mText.Count() ) || - !mImpl->IsPlaceholderAvailable() ) - { - mImpl->QueueModifyEvent( ModifyEvent::TEXT_DELETED ); - } - else - { - ShowPlaceholderText(); - } - mImpl->mEventData->mUpdateCursorPosition = true; - mImpl->mEventData->mScrollAfterDelete = true; - } - - return removed; + return EventHandler::DeleteEvent(*this, keyCode); } // private : Helpers. @@ -4221,9 +2948,9 @@ void Controller::ResetText() // We have cleared everything including the placeholder-text mImpl->PlaceholderCleared(); - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0u; + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = 0u; // Clear any previous text. mImpl->mTextUpdateInfo.mClearAll = true; @@ -4240,11 +2967,11 @@ void Controller::ResetText() void Controller::ShowPlaceholderText() { - if( mImpl->IsPlaceholderAvailable() ) + if(mImpl->IsPlaceholderAvailable()) { - DALI_ASSERT_DEBUG( mImpl->mEventData && "No placeholder text available" ); + DALI_ASSERT_DEBUG(mImpl->mEventData && "No placeholder text available"); - if( NULL == mImpl->mEventData ) + if(NULL == mImpl->mEventData) { return; } @@ -4252,16 +2979,16 @@ void Controller::ShowPlaceholderText() mImpl->mEventData->mIsShowingPlaceholderText = true; // Disable handles when showing place-holder text - mImpl->mEventData->mDecorator->SetHandleActive( GRAB_HANDLE, false ); - mImpl->mEventData->mDecorator->SetHandleActive( LEFT_SELECTION_HANDLE, false ); - mImpl->mEventData->mDecorator->SetHandleActive( RIGHT_SELECTION_HANDLE, false ); + mImpl->mEventData->mDecorator->SetHandleActive(GRAB_HANDLE, false); + mImpl->mEventData->mDecorator->SetHandleActive(LEFT_SELECTION_HANDLE, false); + mImpl->mEventData->mDecorator->SetHandleActive(RIGHT_SELECTION_HANDLE, false); - const char* text( NULL ); - size_t size( 0 ); + const char* text(NULL); + size_t size(0); // TODO - Switch Placeholder text when changing state - if( ( EventData::INACTIVE != mImpl->mEventData->mState ) && - ( 0u != mImpl->mEventData->mPlaceholderTextActive.c_str() ) ) + if((EventData::INACTIVE != mImpl->mEventData->mState) && + (0u != mImpl->mEventData->mPlaceholderTextActive.c_str())) { text = mImpl->mEventData->mPlaceholderTextActive.c_str(); size = mImpl->mEventData->mPlaceholderTextActive.size(); @@ -4272,24 +2999,24 @@ void Controller::ShowPlaceholderText() size = mImpl->mEventData->mPlaceholderTextInactive.size(); } - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; // Reset model for showing placeholder. mImpl->mModel->mLogicalModel->mText.Clear(); - mImpl->mModel->mVisualModel->SetTextColor( mImpl->mEventData->mPlaceholderTextColor ); + mImpl->mModel->mVisualModel->SetTextColor(mImpl->mEventData->mPlaceholderTextColor); // Convert text into UTF-32 Vector& utf32Characters = mImpl->mModel->mLogicalModel->mText; - utf32Characters.Resize( size ); + utf32Characters.Resize(size); // This is a bit horrible but std::string returns a (signed) char* - const uint8_t* utf8 = reinterpret_cast( text ); + const uint8_t* utf8 = reinterpret_cast(text); // Transform a text array encoded in utf8 into an array encoded in utf32. // It returns the actual number of characters. - const Length characterCount = Utf8ToUtf32( utf8, size, utf32Characters.Begin() ); - utf32Characters.Resize( characterCount ); + const Length characterCount = Utf8ToUtf32(utf8, size, utf32Characters.Begin()); + utf32Characters.Resize(characterCount); // The characters to be added. mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = characterCount; @@ -4307,35 +3034,35 @@ void Controller::ShowPlaceholderText() mImpl->mOperationsPending = ALL_OPERATIONS; // Update the rest of the model during size negotiation - mImpl->QueueModifyEvent( ModifyEvent::TEXT_REPLACED ); + mImpl->QueueModifyEvent(ModifyEvent::TEXT_REPLACED); } } void Controller::ClearFontData() { - if( mImpl->mFontDefaults ) + if(mImpl->mFontDefaults) { mImpl->mFontDefaults->mFontId = 0u; // Remove old font ID } // Set flags to update the model. - mImpl->mTextUpdateInfo.mCharacterIndex = 0u; + mImpl->mTextUpdateInfo.mCharacterIndex = 0u; mImpl->mTextUpdateInfo.mNumberOfCharactersToRemove = mImpl->mTextUpdateInfo.mPreviousNumberOfCharacters; - mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); + mImpl->mTextUpdateInfo.mNumberOfCharactersToAdd = mImpl->mModel->mLogicalModel->mText.Count(); - mImpl->mTextUpdateInfo.mClearAll = true; + mImpl->mTextUpdateInfo.mClearAll = true; mImpl->mTextUpdateInfo.mFullRelayoutNeeded = true; - mImpl->mRecalculateNaturalSize = true; + mImpl->mRecalculateNaturalSize = true; - mImpl->mOperationsPending = static_cast( mImpl->mOperationsPending | - VALIDATE_FONTS | - SHAPE_TEXT | - BIDI_INFO | - GET_GLYPH_METRICS | - LAYOUT | - UPDATE_LAYOUT_SIZE | - REORDER | - ALIGN ); + mImpl->mOperationsPending = static_cast(mImpl->mOperationsPending | + VALIDATE_FONTS | + SHAPE_TEXT | + BIDI_INFO | + GET_GLYPH_METRICS | + LAYOUT | + UPDATE_LAYOUT_SIZE | + REORDER | + ALIGN); } void Controller::ClearStyleData() @@ -4344,15 +3071,15 @@ void Controller::ClearStyleData() mImpl->mModel->mLogicalModel->ClearFontDescriptionRuns(); } -void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) +void Controller::ResetCursorPosition(CharacterIndex cursorIndex) { // Reset the cursor position - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { mImpl->mEventData->mPrimaryCursorPosition = cursorIndex; // Update the cursor if it's in editing mode. - if( EventData::IsEditingState( mImpl->mEventData->mState ) ) + if(EventData::IsEditingState(mImpl->mEventData->mState)) { mImpl->mEventData->mUpdateCursorPosition = true; } @@ -4361,15 +3088,15 @@ void Controller::ResetCursorPosition( CharacterIndex cursorIndex ) void Controller::ResetScrollPosition() { - if( NULL != mImpl->mEventData ) + if(NULL != mImpl->mEventData) { // Reset the scroll position. - mImpl->mModel->mScrollPosition = Vector2::ZERO; + mImpl->mModel->mScrollPosition = Vector2::ZERO; mImpl->mEventData->mScrollAfterUpdatePosition = true; } } -void Controller::SetControlInterface( ControlInterface* controlInterface ) +void Controller::SetControlInterface(ControlInterface* controlInterface) { mImpl->mControlInterface = controlInterface; } @@ -4387,21 +3114,20 @@ Actor Controller::CreateBackgroundActor() // private : Private contructors & copy operator. Controller::Controller() -: mImpl( NULL ) +: Controller(nullptr, nullptr, nullptr) { - mImpl = new Controller::Impl( NULL, NULL ); } -Controller::Controller( ControlInterface* controlInterface ) +Controller::Controller(ControlInterface* controlInterface) +: Controller(controlInterface, nullptr, nullptr) { - mImpl = new Controller::Impl( controlInterface, NULL ); } -Controller::Controller( ControlInterface* controlInterface, - EditableControlInterface* editableControlInterface ) +Controller::Controller(ControlInterface* controlInterface, + EditableControlInterface* editableControlInterface, + SelectableControlInterface* selectableControlInterface) +: mImpl(new Controller::Impl(controlInterface, editableControlInterface, selectableControlInterface)) { - mImpl = new Controller::Impl( controlInterface, - editableControlInterface ); } // The copy constructor and operator are left unimplemented.