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=434a1e06957e4e680999067305418d61dcf338df;hb=e5a56dace042712c1d89015bcb43942dfb237af8;hpb=8cb7d1587a132f32f869eb1f8f8712d390cecc50 diff --git a/dali-toolkit/internal/text/text-controller-impl.h b/dali-toolkit/internal/text/text-controller-impl.h index 434a1e0..f88ca8d 100644 --- a/dali-toolkit/internal/text/text-controller-impl.h +++ b/dali-toolkit/internal/text/text-controller-impl.h @@ -20,13 +20,14 @@ // EXTERNAL INCLUDES #include -#include #include // INTERNAL INCLUDES +#include #include #include #include +#include #include namespace Dali @@ -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. @@ -104,9 +107,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 }; @@ -115,10 +119,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. @@ -126,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. @@ -155,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 @@ -173,26 +186,41 @@ struct ModifyEvent struct FontDefaults { FontDefaults() - : mDefaultPointSize(0.0f), - mFontId(0u) + : mFontDescription(), + mFontStyle(), + 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(); + fontClient.GetDefaultPlatformFontDescription( mFontDescription ); } FontId GetFontId( TextAbstraction::FontClient& fontClient ) { if( !mFontId ) { - Dali::TextAbstraction::PointSize26Dot6 pointSize = mDefaultPointSize*64; - mFontId = fontClient.GetFontId( mDefaultFontFamily, mDefaultFontStyle, pointSize ); + const PointSize26Dot6 pointSize = static_cast( mDefaultPointSize * 64.f ); + mFontId = fontClient.GetFontId( mFontDescription, pointSize ); } return mFontId; } - std::string mDefaultFontFamily; - std::string mDefaultFontStyle; - 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 @@ -206,14 +234,15 @@ struct Controller::Impl mFontClient(), mClipboard(), mView(), + mMetrics(), mLayoutEngine(), mModifyEvents(), - mControlSize(), mTextColor( Color::BLACK ), mAlignmentOffset(), mOperationsPending( NO_OPERATION ), - mMaximumNumberOfCharacters( 50 ), - mRecalculateNaturalSize( true ) + mMaximumNumberOfCharacters( 50u ), + mRecalculateNaturalSize( true ), + mMarkupProcessorEnabled( false ) { mLogicalModel = LogicalModel::New(); mVisualModel = VisualModel::New(); @@ -223,6 +252,10 @@ struct Controller::Impl mView.SetVisualModel( mVisualModel ); + // Use this to access FontClient i.e. to get down-scaled Emoji metrics. + mMetrics = Metrics::New( mFontClient ); + mLayoutEngine.SetMetrics( mMetrics ); + // Set the text properties to default mVisualModel->SetUnderlineEnabled( false ); mVisualModel->SetUnderlineHeight( 0.0f ); @@ -230,6 +263,7 @@ struct Controller::Impl ~Impl() { + delete mFontDefaults; delete mEventData; } @@ -246,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(); @@ -279,6 +313,20 @@ struct Controller::Impl } /** + * @brief Helper to check whether active place-holder text is available. + */ + bool IsFocusedPlaceholderAvailable() const + { + return ( mEventData && !mEventData->mPlaceholderTextActive.empty() ); + } + + bool IsShowingRealText() const + { + return ( !IsShowingPlaceholderText() && + 0u != mLogicalModel->mText.Count() ); + } + + /** * @brief Called when placeholder-text is hidden */ void PlaceholderCleared() @@ -304,14 +352,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() @@ -320,15 +370,38 @@ 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[out] fonts The default font family, style and point sizes. - * @param[in] numberOfCharacters The number of characters in the logical model. + * @param[in] operationsRequired The operations required. + * + * @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. + */ + float GetDefaultFontLineHeight(); void OnCursorKeyEvent( const Event& event ); @@ -344,7 +417,7 @@ struct Controller::Impl void OnSelectAllEvent(); - void RetrieveSelection( std::string& selectedText, bool deleteAfterRetreival ); + void RetrieveSelection( std::string& selectedText, bool deleteAfterRetrieval ); void ShowClipboard(); @@ -354,9 +427,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(); @@ -404,18 +477,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. @@ -436,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. @@ -448,7 +526,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. @@ -456,16 +534,18 @@ struct Controller::Impl FontDefaults* mFontDefaults; ///< Avoid allocating this when the user does not specify a font. EventData* mEventData; ///< Avoid allocating everything for text input until EnableTextInput(). TextAbstraction::FontClient mFontClient; ///< Handle to the font client. - Clipboard mClipboard; ///< Handle to the system clipboard + Clipboard mClipboard; ///< Handle to the system clipboard 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. - Size mControlSize; ///< The size of the control. + 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 mMarkupProcessorEnabled:1; ///< Whether the mark-up procesor is enabled. }; } // namespace Text