X-Git-Url: http://review.tizen.org/git/?p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git;a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller-impl.h;h=927352c0ba2abc022640b9dfeb03d34f95ef2211;hp=351ff82619fe052f981990460cfc37fdacffb4fa;hb=7defa3b4bae282299a3c701bbf1e3d4a1d968786;hpb=3480a42d70353c1975e53f07a492cf12cdd76578 diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h index 351ff82..927352c 100644 --- a/dali-toolkit/internal/text/text-controller-impl.h +++ b/dali-toolkit/internal/text/text-controller-impl.h @@ -104,10 +104,10 @@ struct EventData INACTIVE, INTERRUPTED, SELECTING, - SELECTION_CHANGED, EDITING, EDITING_WITH_POPUP, EDITING_WITH_GRAB_HANDLE, + EDITING_WITH_PASTE_POPUP, GRAB_HANDLE_PANNING, SELECTION_HANDLE_PANNING }; @@ -116,10 +116,16 @@ struct EventData ~EventData(); - DecoratorPtr mDecorator; ///< Pointer to the decorator - std::string mPlaceholderTextActive; ///< The text to display when the TextField is empty with key-input focus - std::string mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive - Vector4 mPlaceholderTextColor; ///< The in/active placeholder text color + static bool IsEditingState( State stateToCheck ) + { + return ( stateToCheck == EDITING || stateToCheck == EDITING_WITH_POPUP || stateToCheck == EDITING_WITH_GRAB_HANDLE || stateToCheck == EDITING_WITH_PASTE_POPUP ); + } + + DecoratorPtr mDecorator; ///< Pointer to the decorator. + ImfManager mImfManager; ///< The Input Method Framework Manager. + std::string mPlaceholderTextActive; ///< The text to display when the TextField is empty with key-input focus. + std::string mPlaceholderTextInactive; ///< The text to display when the TextField is empty and inactive. + Vector4 mPlaceholderTextColor; ///< The in/active placeholder text color. /** * This is used to delay handling events until after the model has been updated. @@ -156,7 +162,7 @@ struct EventData bool mUpdateRightSelectionPosition : 1; ///< True if the visual position of the right selection handle must be recalculated. bool mScrollAfterUpdatePosition : 1; ///< Whether to scroll after the cursor position is updated. bool mScrollAfterDelete : 1; ///< Whether to scroll after delete characters. - bool mAllTextSelected : 1; ///< True if the selection handles are selecting all the text + bool mAllTextSelected : 1; ///< True if the selection handles are selecting all the text. }; struct ModifyEvent @@ -188,7 +194,7 @@ struct FontDefaults { if( !mFontId ) { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; + const PointSize26Dot6 pointSize = static_cast( mDefaultPointSize * 64.f ); mFontId = fontClient.GetFontId( mFontDescription, pointSize ); } @@ -218,7 +224,7 @@ struct Controller::Impl mTextColor( Color::BLACK ), mAlignmentOffset(), mOperationsPending( NO_OPERATION ), - mMaximumNumberOfCharacters( 50 ), + mMaximumNumberOfCharacters( 50u ), mRecalculateNaturalSize( true ), mUserDefinedFontFamily( false ) { @@ -258,12 +264,12 @@ struct Controller::Impl if( ModifyEvent::TEXT_REPLACED == type) { // Cancel previously queued inserts etc. - mModifyEvents.clear(); + mModifyEvents.Clear(); } ModifyEvent event; event.type = type; - mModifyEvents.push_back( event ); + mModifyEvents.PushBack( event ); // The event will be processed during relayout RequestRelayout(); @@ -290,6 +296,14 @@ struct Controller::Impl return ( mEventData && mEventData->mIsShowingPlaceholderText ); } + /** + * @brief Helper to check whether active place-holder text is available. + */ + bool IsFocusedPlaceholderAvailable() const + { + return ( mEventData && !mEventData->mPlaceholderTextActive.empty() ); + } + bool IsShowingRealText() const { return ( !IsShowingPlaceholderText() && @@ -322,14 +336,16 @@ struct Controller::Impl void ResetImfManager() { - // Reset incase we are in a pre-edit state. - ImfManager imfManager = ImfManager::Get(); - if ( imfManager ) + if( mEventData ) { - imfManager.Reset(); // Will trigger a commit message - } + // Reset incase we are in a pre-edit state. + if( mEventData->mImfManager ) + { + mEventData->mImfManager.Reset(); // Will trigger a message ( commit, get surrounding ) + } - ClearPreEditFlag(); + ClearPreEditFlag(); + } } bool IsClipboardEmpty() @@ -367,7 +383,7 @@ struct Controller::Impl void OnSelectAllEvent(); - void RetrieveSelection( std::string& selectedText, bool deleteAfterRetreival ); + void RetrieveSelection( std::string& selectedText, bool deleteAfterRetrieval ); void ShowClipboard(); @@ -377,9 +393,9 @@ struct Controller::Impl void SendSelectionToClipboard( bool deleteAfterSending ); - void GetTextFromClipboard( unsigned int itemIndex, std::string& retreivedString ); + void GetTextFromClipboard( unsigned int itemIndex, std::string& retrievedString ); - void RepositionSelectionHandles( CharacterIndex selectionStart, CharacterIndex selectionEnd ); + void RepositionSelectionHandles(); void RepositionSelectionHandles( float visualX, float visualY ); void SetPopupButtons(); @@ -427,18 +443,23 @@ struct Controller::Impl /** * @brief Updates the cursor position. * - * Retrieves the x,y position of the cursor logical position and sets it into the decorator. + * Sets the cursor's position into the decorator. It transforms the cursor's position into decorator's coords. * It sets the position of the secondary cursor if it's a valid one. * Sets which cursors are active. + * + * @param[in] cursorInfo Contains the selection handle position in Actor's coords. + * */ - void UpdateCursorPosition(); + void UpdateCursorPosition( const CursorInfo& cursorInfo ); /** - * @brief Updates the position of the given selection handle. + * @brief Updates the position of the given selection handle. It transforms the handle's position into decorator's coords. * * @param[in] handleType One of the selection handles. + * @param[in] cursorInfo Contains the selection handle position in Actor's coords. */ - void UpdateSelectionHandle( HandleType handleType ); + void UpdateSelectionHandle( HandleType handleType, + const CursorInfo& cursorInfo ); /** * @biref Clamps the horizontal scrolling to get the control always filled with text. @@ -471,7 +492,7 @@ struct Controller::Impl * * This method is called after deleting text. */ - void ScrollTextToMatchCursor(); + void ScrollTextToMatchCursor( const CursorInfo& cursorInfo); ControlInterface& mControlInterface; ///< Reference to the text controller. LogicalModelPtr mLogicalModel; ///< Pointer to the logical model. @@ -483,7 +504,7 @@ struct Controller::Impl View mView; ///< The view interface to the rendering back-end. MetricsPtr mMetrics; ///< A wrapper around FontClient used to get metrics & potentially down-scaled Emoji metrics. LayoutEngine mLayoutEngine; ///< The layout engine. - std::vector mModifyEvents; ///< Temporary stores the text set until the next relayout. + Vector mModifyEvents; ///< Temporary stores the text set until the next relayout. Vector4 mTextColor; ///< The regular text color Vector2 mAlignmentOffset; ///< Vertical and horizontal offset of the whole text inside the control due to alignment. OperationsMask mOperationsPending; ///< Operations pending to be done to layout the text. @@ -491,6 +512,7 @@ struct Controller::Impl bool mRecalculateNaturalSize:1; ///< Whether the natural size needs to be recalculated. bool mUserDefinedFontFamily:1; ///< Whether the Font family was set by the user instead of being left as sytem default. + }; } // namespace Text