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=f88ca8db6db2cfbbc559e616a8c2f321715b3a71;hp=190549c79f94d89a9b5c72620cc2b19ded937d82;hb=e5a56dace042712c1d89015bcb43942dfb237af8;hpb=69669144df0027a66725f167fd1b99e12b8860ad diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h index 190549c..f88ca8d 100644 --- a/dali-toolkit/internal/text/text-controller-impl.h +++ b/dali-toolkit/internal/text/text-controller-impl.h @@ -23,6 +23,7 @@ #include // INTERNAL INCLUDES +#include #include #include #include @@ -80,6 +81,7 @@ struct CursorInfo CursorInfo() : primaryPosition(), secondaryPosition(), + lineOffset( 0.f ), lineHeight( 0.f ), primaryCursorHeight( 0.f ), secondaryCursorHeight( 0.f ), @@ -91,6 +93,7 @@ struct CursorInfo Vector2 primaryPosition; ///< The primary cursor's position. Vector2 secondaryPosition; ///< The secondary cursor's position. + float lineOffset; ///< The vertical offset where the line containing the cursor starts. float lineHeight; ///< The height of the line where the cursor is placed. float primaryCursorHeight; ///< The primary cursor's height. float secondaryCursorHeight; ///< The secondary cursor's height. @@ -133,6 +136,8 @@ struct EventData */ std::vector mEventQueue; ///< The queue of touch events etc. + InputStyle mInputStyle; ///< The style to be set to the new inputed text. + /** * 0,0 means that the top-left corner of the layout matches the top-left corner of the UI control. * Typically this will have a negative value with scrolling occurs. @@ -163,6 +168,7 @@ struct EventData 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 mUpdateInputStyle : 1; ///< Whether to update the input style after moving the cursor. }; struct ModifyEvent @@ -183,7 +189,12 @@ struct FontDefaults : mFontDescription(), mFontStyle(), mDefaultPointSize( 0.f ), - mFontId( 0u ) + mFontId( 0u ), + familyDefined( false ), + weightDefined( false ), + widthDefined( false ), + slantDefined( false ), + sizeDefined( false ) { // Initially use the default platform font TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); @@ -201,10 +212,15 @@ struct FontDefaults return mFontId; } - TextAbstraction::FontDescription mFontDescription; - std::string mFontStyle; - float mDefaultPointSize; - FontId mFontId; + TextAbstraction::FontDescription mFontDescription; ///< The default font's description. + std::string mFontStyle; ///< The font's style string set through the property system. + float mDefaultPointSize; ///< The default font's point size. + FontId mFontId; ///< The font's id of the default font. + bool familyDefined:1; ///< Whether the default font's family name is defined. + bool weightDefined:1; ///< Whether the default font's weight is defined. + bool widthDefined:1; ///< Whether the default font's width is defined. + bool slantDefined:1; ///< Whether the default font's slant is defined. + bool sizeDefined:1; ///< Whether the default font's point size is defined. }; struct Controller::Impl @@ -226,7 +242,6 @@ struct Controller::Impl mOperationsPending( NO_OPERATION ), mMaximumNumberOfCharacters( 50u ), mRecalculateNaturalSize( true ), - mUserDefinedFontFamily( false ), mMarkupProcessorEnabled( false ) { mLogicalModel = LogicalModel::New(); @@ -355,15 +370,33 @@ struct Controller::Impl return !result; // // If NumberOfItems greater than 0, return false } + /** + * @brief Updates the logical and visual models. + * + * When text or style changes the model is set with some operations pending. + * When i.e. the text's size or a relayout is required this method is called + * with a given @p operationsRequired parameter. The operations required are + * matched with the operations pending to perform the minimum number of operations. + * + * @param[in] operationsRequired The operations required. + */ void UpdateModel( OperationsMask operationsRequired ); /** - * @brief Retrieve the default fonts. + * @brief Updates the style runs in the visual model when the text's styles changes. + * + * @param[in] operationsRequired The operations required. + * + * @return @e true if the model has been modified. + */ + bool UpdateModelStyle( OperationsMask operationsRequired ); + + /** + * @brief Retreieves the default style. * - * @param[out] fonts The default font family, style and point sizes. - * @param[in] numberOfCharacters The number of characters in the logical model. + * @param[out] inputStyle The default style. */ - void GetDefaultFonts( Dali::Vector& fonts, Length numberOfCharacters ); + void RetrieveDefaultInputStyle( InputStyle& inputStyle ); /** * @brief Retrieve the line height of the default font. @@ -481,7 +514,7 @@ struct Controller::Impl * * @pre mEventData must not be NULL. (there is a text-input or selection capabilities). * - * @param[in] position A position in decorator coords. + * @param[in] position A position in text coords. * * This method is called after inserting text, moving the cursor with the grab handle or the keypad, * or moving the selection handles. @@ -493,7 +526,7 @@ struct Controller::Impl * * This method is called after deleting text. */ - void ScrollTextToMatchCursor( const CursorInfo& cursorInfo); + void ScrollTextToMatchCursor( const CursorInfo& cursorInfo ); ControlInterface& mControlInterface; ///< Reference to the text controller. LogicalModelPtr mLogicalModel; ///< Pointer to the logical model. @@ -512,7 +545,6 @@ struct Controller::Impl Length mMaximumNumberOfCharacters; ///< Maximum number of characters that can be inserted. 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. bool mMarkupProcessorEnabled:1; ///< Whether the mark-up procesor is enabled. };