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=f1c4bc4ff17571fce3727c03ca74f44748139199;hp=8ada007de5669a9eeaa3aa2f71fc130d28a4d0a6;hb=de867fc73465d5681673638736f9b447303fef64;hpb=2d40f1ebb089eddf1c8b8c940a43801d2845974d diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h index 8ada007..f1c4bc4 100644 --- a/dali-toolkit/internal/text/text-controller-impl.h +++ b/dali-toolkit/internal/text/text-controller-impl.h @@ -104,7 +104,6 @@ struct EventData INACTIVE, INTERRUPTED, SELECTING, - SELECTION_CHANGED, EDITING, EDITING_WITH_POPUP, EDITING_WITH_GRAB_HANDLE, @@ -390,7 +389,7 @@ struct Controller::Impl void GetTextFromClipboard( unsigned int itemIndex, std::string& retreivedString ); - void RepositionSelectionHandles( CharacterIndex selectionStart, CharacterIndex selectionEnd ); + void RepositionSelectionHandles(); void RepositionSelectionHandles( float visualX, float visualY ); void SetPopupButtons(); @@ -438,18 +437,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. @@ -482,7 +486,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.