X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Ftext-controller.h;h=8517ca5116bcfecf485b6f2c07093512d5bb9d70;hb=28658e9b0c89fced72173c582b9c5635e07bd6f1;hp=7badd1e78dca6fb6143a487fd79a1780520241cb;hpb=aeef40d5dd70c7d878c7664986913ef2c6675a03;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/text-controller.h b/dali-toolkit/internal/text/text-controller.h index 7badd1e..8517ca5 100644 --- a/dali-toolkit/internal/text/text-controller.h +++ b/dali-toolkit/internal/text/text-controller.h @@ -108,6 +108,13 @@ public: DONT_UPDATE_INPUT_STYLE }; + enum UpdateTextType + { + NONE_UPDATED = 0x0, + MODEL_UPDATED = 0x1, + DECORATOR_UPDATED = 0x2 + }; + /** * @brief Create a new instance of a Controller. * @@ -191,7 +198,7 @@ public: /** * @brief Retrieve any text previously set. * - * @return A string of UTF-8 characters. + * @param[out] text A string of UTF-8 characters. */ void GetText( std::string& text ) const; @@ -212,13 +219,6 @@ public: UpdateInputStyleType type ); /** - * @brief Retrieve the current cursor position. - * - * @return The cursor position. - */ - unsigned int GetLogicalCursorPosition() const; - - /** * @brief Replaces any placeholder text previously set. * * @param[in] type Different placeholder-text can be shown when the control is active/inactive. @@ -729,9 +729,10 @@ public: * * @note UI Controls are expected to minimize calls to this method e.g. call once after size negotiation. * @param[in] size A the size of a bounding box to layout text within. - * @return True if the text model or decorations were updated. + * + * @return Whether the text model or decorations were updated. */ - bool Relayout( const Size& size ); + UpdateTextType Relayout( const Size& size ); /** * @brief Process queued events which modify the model. @@ -963,11 +964,6 @@ private: bool BackspaceKeyEvent(); /** - * @brief Helper to notify IMF manager with surrounding text & cursor changes. - */ - void NotifyImfManager(); - - /** * @brief Helper to clear font-specific data. */ void ShowPlaceholderText();