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=0f5149d3fcc764305a6a39916ca9e10c9af9df54;hb=e5a56dace042712c1d89015bcb43942dfb237af8;hpb=4b3b7f4169b809c086e09323960271f187e3558a diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h index 0f5149d..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. @@ -162,7 +167,8 @@ 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. + bool mUpdateInputStyle : 1; ///< Whether to update the input style after moving the cursor. }; struct ModifyEvent @@ -182,8 +188,13 @@ struct FontDefaults FontDefaults() : mFontDescription(), mFontStyle(), - mDefaultPointSize(0.0f), - mFontId(0u) + mDefaultPointSize( 0.f ), + mFontId( 0u ), + familyDefined( false ), + weightDefined( false ), + widthDefined( false ), + slantDefined( false ), + sizeDefined( false ) { // Initially use the default platform font TextAbstraction::FontClient fontClient = TextAbstraction::FontClient::Get(); @@ -194,17 +205,22 @@ struct FontDefaults { if( !mFontId ) { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; + const PointSize26Dot6 pointSize = static_cast( mDefaultPointSize * 64.f ); mFontId = fontClient.GetFontId( mFontDescription, pointSize ); } 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 @@ -224,9 +240,9 @@ struct Controller::Impl mTextColor( Color::BLACK ), mAlignmentOffset(), mOperationsPending( NO_OPERATION ), - mMaximumNumberOfCharacters( 50 ), + mMaximumNumberOfCharacters( 50u ), mRecalculateNaturalSize( true ), - mUserDefinedFontFamily( false ) + mMarkupProcessorEnabled( false ) { mLogicalModel = LogicalModel::New(); mVisualModel = VisualModel::New(); @@ -264,12 +280,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(); @@ -354,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. * - * @param[out] fonts The default font family, style and point sizes. - * @param[in] numberOfCharacters The number of characters in the logical model. + * @return @e true if the model has been modified. */ - void GetDefaultFonts( Dali::Vector& fonts, Length numberOfCharacters ); + bool UpdateModelStyle( OperationsMask operationsRequired ); + + /** + * @brief Retreieves the default style. + * + * @param[out] inputStyle The default style. + */ + void RetrieveDefaultInputStyle( InputStyle& inputStyle ); /** * @brief Retrieve the line height of the default font. @@ -383,7 +417,7 @@ struct Controller::Impl void OnSelectAllEvent(); - void RetrieveSelection( std::string& selectedText, bool deleteAfterRetreival ); + void RetrieveSelection( std::string& selectedText, bool deleteAfterRetrieval ); void ShowClipboard(); @@ -393,7 +427,7 @@ 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(); void RepositionSelectionHandles( float visualX, float visualY ); @@ -480,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. @@ -492,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. @@ -504,15 +538,14 @@ 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. 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. }; } // namespace Text