X-Git-Url: http://review.tizen.org/git/?a=blobdiff_plain;f=dali-toolkit%2Finternal%2Ftext%2Flayouts%2Flayout-parameters.h;h=f8a62b3aaba9c51365b4cb405c28452f46098105;hb=b8da2e53925b9abb9fa362560069e8ca4aa62f81;hp=b3aeaadf79e8eac2dd6b608db03ba28b903a8095;hpb=2c41553e8144b52da80b174939367a34ac2a871d;p=platform%2Fcore%2Fuifw%2Fdali-toolkit.git diff --git a/dali-toolkit/internal/text/layouts/layout-parameters.h b/dali-toolkit/internal/text/layouts/layout-parameters.h old mode 100755 new mode 100644 index b3aeaad..f8a62b3 --- a/dali-toolkit/internal/text/layouts/layout-parameters.h +++ b/dali-toolkit/internal/text/layouts/layout-parameters.h @@ -2,7 +2,7 @@ #define DALI_TOOLKIT_TEXT_LAYOUT_PARAMETERS_H /* - * Copyright (c) 2017 Samsung Electronics Co., Ltd. + * Copyright (c) 2021 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. @@ -22,24 +22,20 @@ #include // INTERNAL INCLUDES -#include #include #include +#include namespace Dali { - namespace Toolkit { - namespace Text { - struct BidirectionalLineInfoRun; namespace Layout { - /** * @brief Struct used to pass parameters. */ @@ -51,30 +47,31 @@ struct Parameters * @param[in] boundingBox The size of the box containing the text. * @param[in,out] textModel The text's model. */ - Parameters( const Vector2& boundingBox, - ModelPtr textModel ) - : boundingBox{ boundingBox }, - textModel{ textModel }, - lineBidirectionalInfoRunsBuffer{ nullptr }, - numberOfBidirectionalInfoRuns{ 0u }, - startGlyphIndex{ 0u }, - numberOfGlyphs{ 0u }, - startLineIndex{ 0u }, - estimatedNumberOfLines{ 0u }, - interGlyphExtraAdvance{ 0.f }, - isLastNewParagraph{ false } - {} + Parameters(const Vector2& boundingBox, + ModelPtr textModel) + : boundingBox{boundingBox}, + textModel{textModel}, + lineBidirectionalInfoRunsBuffer{nullptr}, + numberOfBidirectionalInfoRuns{0u}, + startGlyphIndex{0u}, + numberOfGlyphs{0u}, + startLineIndex{0u}, + estimatedNumberOfLines{0u}, + interGlyphExtraAdvance{0.f}, + isLastNewParagraph{false} + { + } - Vector2 boundingBox; ///< The size of the box containing the text. - ModelPtr textModel; - BidirectionalLineInfoRun* lineBidirectionalInfoRunsBuffer; ///< Bidirectional conversion tables per line. - Length numberOfBidirectionalInfoRuns; ///< The number of lines with bidirectional info. - GlyphIndex startGlyphIndex; ///< Index to the first glyph to layout. - Length numberOfGlyphs; ///< The number of glyphs to layout. - LineIndex startLineIndex; ///< The line index where to insert the new lines. - Length estimatedNumberOfLines; ///< The estimated number of lines. - float interGlyphExtraAdvance; ///< Extra advance added to each glyph. - bool isLastNewParagraph:1; ///< Whether the last character is a new paragraph character. + Vector2 boundingBox; ///< The size of the box containing the text. + ModelPtr textModel; + BidirectionalLineInfoRun* lineBidirectionalInfoRunsBuffer; ///< Bidirectional conversion tables per line. + Length numberOfBidirectionalInfoRuns; ///< The number of lines with bidirectional info. + GlyphIndex startGlyphIndex; ///< Index to the first glyph to layout. + Length numberOfGlyphs; ///< The number of glyphs to layout. + LineIndex startLineIndex; ///< The line index where to insert the new lines. + Length estimatedNumberOfLines; ///< The estimated number of lines. + float interGlyphExtraAdvance; ///< Extra advance added to each glyph. + bool isLastNewParagraph : 1; ///< Whether the last character is a new paragraph character. }; } // namespace Layout