X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=base%2Fdali-toolkit%2Finternal%2Fcontrols%2Ftext-view%2Ftext-view-impl.h;h=70c149a5fc75a763e15487c2da8735d0b8319b8a;hb=7d06085244b3d0ff90ac7bed11fc816931ed3565;hp=e4e7dd4cc8ccb904d0d91e245ff548b20bf743df;hpb=00ef589046a32c53d20de1c61af7cc69524e51dc;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h index e4e7dd4..70c149a 100644 --- a/base/dali-toolkit/internal/controls/text-view/text-view-impl.h +++ b/base/dali-toolkit/internal/controls/text-view/text-view-impl.h @@ -1,30 +1,28 @@ #ifndef __DALI_TOOLKIT_INTERNAL_TEXT_VIEW_H__ #define __DALI_TOOLKIT_INTERNAL_TEXT_VIEW_H__ -// -// Copyright (c) 2014 Samsung Electronics Co., Ltd. -// -// Licensed under the Flora License, Version 1.0 (the License); -// you may not use this file except in compliance with the License. -// You may obtain a copy of the License at -// -// http://floralicense.org/license/ -// -// Unless required by applicable law or agreed to in writing, software -// distributed under the License is distributed on an AS IS BASIS, -// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. -// See the License for the specific language governing permissions and -// limitations under the License. -// +/* + * Copyright (c) 2014 Samsung Electronics Co., Ltd. + * + * Licensed under the Apache License, Version 2.0 (the "License"); + * you may not use this file except in compliance with the License. + * You may obtain a copy of the License at + * + * http://www.apache.org/licenses/LICENSE-2.0 + * + * Unless required by applicable law or agreed to in writing, software + * distributed under the License is distributed on an "AS IS" BASIS, + * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. + * See the License for the specific language governing permissions and + * limitations under the License. + * + */ // INTERNAL INCLUDES -#include - -#include #include #include -#include "text-actor-cache.h" -#include "text-view-processor-types.h" +#include +#include namespace Dali { @@ -92,7 +90,7 @@ public: TextViewProcessorMetadataType mType; ///< Stores the type of operation. std::size_t mPosition; ///< Character position within the text. - std::size_t mNumberOfCharacters; ///< Number of characters to be removed/ replaced. + std::size_t mNumberOfCharacters; ///< Number of characters to be removed/replaced. MarkupProcessor::StyledTextArray mText; ///< The new text. TextStyle::Mask mStyleMask; ///< The style mask. }; @@ -110,7 +108,6 @@ public: RELAYOUT_INITIALIZE_TEXT_ACTORS = 0x10, ///< Initialize text-actors (create handles). RELAYOUT_TEXT_ACTOR_UPDATE = 0x20, ///< Updates text-actors (set size, position, style, ...) RELAYOUT_INSERT_TO_TEXT_VIEW = 0x40, ///< Adds the text-actors to the text-view. - RELAYOUT_INSERT_TO_TEXT_ACTOR_LIST = 0x80, ///< Inserts the text-actors to the text-actor list. RELAYOUT_ALL = 0xFF ///< Does all operations. }; @@ -248,6 +245,11 @@ public: void SetEllipsizeText( const MarkupProcessor::StyledTextArray& ellipsizeText ); /** + * @copydoc SetEllipsizeText() + */ + void SetEllipsizeText( const Text& ellipsizeText, const Vector& ellipsizeStyles ); + + /** * @copydoc GetEllipsizeText() */ std::string GetEllipsizeText() const; @@ -363,9 +365,9 @@ private: // From Control virtual void OnInitialize(); /** - * @copydoc Toolkit::Control::OnStyleChange() + * @copydoc Toolkit::Control::OnFontChange( ) */ - virtual void OnStyleChange( StyleChange change ); + virtual void OnFontChange( bool defaultFontChange, bool defaultFontSizeChange ); /** * @copydoc Toolkit::Control::OnControlSizeSet() @@ -425,8 +427,7 @@ private: TextView& operator=( const TextView& rhs ); /** - * Executes synchronously relayout operations such as set, insert, remove or replace text, or - * split groups of characters, etc. + * Executes synchronously relayout operations such as set, insert, remove or replace text, etc. */ void PerformTextViewProcessorOperations(); @@ -528,6 +529,11 @@ private: Actor GetRootActor() const; /** + * Creates the ellipsize text layout. + */ + void CreateEllipsizeLayout(); + + /** * Handle SetProperty for markup processing. * @param[in] propertyValue The new property value. */ @@ -595,6 +601,11 @@ public: LayoutParameters(); /** + * Default destructor. + */ + ~LayoutParameters(); + + /** * Constructor */ LayoutParameters( Toolkit::TextView::MultilinePolicy multilinePolicy, @@ -603,7 +614,6 @@ public: Toolkit::Alignment::Type alignment, Toolkit::TextView::LineJustification lineJustification, float lineHeightOffset, - const std::string& ellipsizeText, bool markUpEnabled ); /** @@ -617,15 +627,14 @@ public: LayoutParameters& operator=( const LayoutParameters& layoutParameters ); Toolkit::TextView::MultilinePolicy mMultilinePolicy; ///< Stores the multiline policy. - TextView::ExceedPolicy mExceedPolicy; ///< Stores a combination of both policies; + TextView::ExceedPolicy mExceedPolicy; ///< Stores a combination of both policies. Toolkit::TextView::ExceedPolicy mWidthExceedPolicy; ///< Stores the text width exceed policy. Toolkit::TextView::ExceedPolicy mHeightExceedPolicy; ///< Stores the text height exceed policy. Toolkit::Alignment::Type mHorizontalAlignment; ///< Stores the horizontal alignment for the whole text. Toolkit::Alignment::Type mVerticalAlignment; ///< Stores the vertical alignment for the whole text. Toolkit::TextView::LineJustification mLineJustification; ///< Stores the line justification. float mLineHeightOffset; ///< Line height offset to be addded to the font line height (measured in PointSize). - MarkupProcessor::StyledTextArray mEllipsizeText; ///< Stores the ellipsize text - bool mMarkUpEnabled:1; ///< Is markup string scanning enabled + bool mMarkUpEnabled:1; ///< Is markup string scanning enabled. }; /** @@ -657,15 +666,6 @@ public: }; /** - * Temporary data used to calculate line justification. - */ - struct LineJustificationInfo - { - TextViewProcessor::TextInfoIndices mIndices; ///< Indices to the first character of the new line. - float mLineLength; ///< Length of the line (or portion of line). - }; - - /** * The results of the relayout process. */ struct RelayoutData @@ -695,7 +695,6 @@ public: Toolkit::TextView::CharacterLayoutInfoContainer mCharacterLayoutInfoTable; ///< Stores layout info per character sorted by the character's visual index. Toolkit::TextView::LineLayoutInfoContainer mLines; ///< Stores an index to the first character of each line. Size mTextSizeForRelayoutOption; ///< Stores the text size after relayout. - std::vector mLineJustificationInfo; ///< Stores justification info per line. TextActorCache mTextActorCache; ///< Stores previously created text-actors to be reused. };