X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Fbounded-paragraph-run.h;h=4b3150e10cac38a6f1dbed07256237e58dca2c29;hb=66dc29e50b21f132ca11e1b274c401c243938281;hp=6c5b2d86cd6e9d330afd6b75ac60b9a44af24c85;hpb=f6004b92a7b8ea0feed9c468943a3c369da4501e;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/bounded-paragraph-run.h b/dali-toolkit/internal/text/bounded-paragraph-run.h index 6c5b2d8..4b3150e 100644 --- a/dali-toolkit/internal/text/bounded-paragraph-run.h +++ b/dali-toolkit/internal/text/bounded-paragraph-run.h @@ -23,6 +23,7 @@ // INTERNAL INCLUDES #include +#include namespace Dali { @@ -41,7 +42,23 @@ namespace Text */ struct BoundedParagraphRun { - CharacterRun characterRun; ///< The initial character index within the whole text and the number of characters of the run. + /** + * Default constructor to set the default values of bitfields + */ + BoundedParagraphRun() + : characterRun{}, + horizontalAlignment(Text::HorizontalAlignment::BEGIN), + relativeLineSize(1), + horizontalAlignmentDefined{false}, + relativeLineSizeDefined(false) + { + } + + CharacterRun characterRun; ///< The initial character index within the whole text and the number of characters of the run. + Text::HorizontalAlignment::Type horizontalAlignment; ///< The paragraph horizontal alignment. Values "BEGIN" "CENTER" "END". + float relativeLineSize; ///< The relative line height to be used for this paragaraph. + bool horizontalAlignmentDefined : 1; ///< Whether the horizontal alignment is defined. + bool relativeLineSizeDefined : 1; ///< Whether the relative line height is defined for this paragraph. }; } // namespace Text