projects
/
platform
/
core
/
uifw
/
dali-toolkit.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
Merge "Added IGNORE_SPACES_AFTER_TEXT property" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
layouts
/
layout-parameters.h
diff --git
a/dali-toolkit/internal/text/layouts/layout-parameters.h
b/dali-toolkit/internal/text/layouts/layout-parameters.h
index
f62191f
..
5a77d86
100644
(file)
--- 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
/*
#define DALI_TOOLKIT_TEXT_LAYOUT_PARAMETERS_H
/*
- * Copyright (c) 201
6
Samsung Electronics Co., Ltd.
+ * Copyright (c) 201
7
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.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@
-22,6
+22,7
@@
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDES
#include <dali/public-api/math/vector2.h>
// INTERNAL INCLUDES
+#include <dali-toolkit/public-api/text/text-enumerations.h>
#include <dali-toolkit/internal/text/text-definitions.h>
namespace Dali
#include <dali-toolkit/internal/text/text-definitions.h>
namespace Dali
@@
-58,6
+59,7
@@
struct Parameters
* @param[in] glyphsPerCharacterBuffer Vector with the number of glyphs shaped from the character.
* @param[in] totalNumberOfGlyphs The number of glyphs.
* @param[in] horizontalAlignment The horizontal alignment.
* @param[in] glyphsPerCharacterBuffer Vector with the number of glyphs shaped from the character.
* @param[in] totalNumberOfGlyphs The number of glyphs.
* @param[in] horizontalAlignment The horizontal alignment.
+ * @param[in] lineWrapMode The text wrap mode.
*/
Parameters( const Vector2& boundingBox,
const Character* const textBuffer,
*/
Parameters( const Vector2& boundingBox,
const Character* const textBuffer,
@@
-70,7
+72,10
@@
struct Parameters
const GlyphIndex* const charactersToGlyphsBuffer,
const Length* const glyphsPerCharacterBuffer,
Length totalNumberOfGlyphs,
const GlyphIndex* const charactersToGlyphsBuffer,
const Length* const glyphsPerCharacterBuffer,
Length totalNumberOfGlyphs,
- HorizontalAlignment horizontalAlignment )
+ Text::HorizontalAlignment::Type horizontalAlignment,
+ Text::LineWrap::Mode lineWrapMode,
+ float outlineWidth,
+ bool ignoreSpaceAfterText )
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
lineBreakInfoBuffer( lineBreakInfoBuffer ),
: boundingBox( boundingBox ),
textBuffer( textBuffer ),
lineBreakInfoBuffer( lineBreakInfoBuffer ),
@@
-89,7
+94,10
@@
struct Parameters
horizontalAlignment( horizontalAlignment ),
startLineIndex( 0u ),
estimatedNumberOfLines( 0u ),
horizontalAlignment( horizontalAlignment ),
startLineIndex( 0u ),
estimatedNumberOfLines( 0u ),
- isLastNewParagraph( false )
+ lineWrapMode( lineWrapMode ),
+ outlineWidth( outlineWidth ),
+ isLastNewParagraph( false ),
+ ignoreSpaceAfterText( ignoreSpaceAfterText )
{}
Vector2 boundingBox; ///< The size of the box containing the text.
{}
Vector2 boundingBox; ///< The size of the box containing the text.
@@
-107,10
+115,13
@@
struct Parameters
GlyphIndex startGlyphIndex; ///< Index to the first glyph to layout.
Length numberOfGlyphs; ///< The number of glyphs to layout.
Length totalNumberOfGlyphs; ///< The number of glyphs.
GlyphIndex startGlyphIndex; ///< Index to the first glyph to layout.
Length numberOfGlyphs; ///< The number of glyphs to layout.
Length totalNumberOfGlyphs; ///< The number of glyphs.
- HorizontalAlignment
horizontalAlignment; ///< The horizontal alignment.
+ HorizontalAlignment
::Type
horizontalAlignment; ///< The horizontal alignment.
LineIndex startLineIndex; ///< The line index where to insert the new lines.
Length estimatedNumberOfLines; ///< The estimated number of lines.
LineIndex startLineIndex; ///< The line index where to insert the new lines.
Length estimatedNumberOfLines; ///< The estimated number of lines.
- bool isLastNewParagraph; ///< Whether the last character is a new paragraph character.
+ Text::LineWrap::Mode lineWrapMode; ///< The line wrap mode for moving to next line.
+ float outlineWidth; ///< The outline width.
+ bool isLastNewParagraph:1; ///< Whether the last character is a new paragraph character.
+ bool ignoreSpaceAfterText:1; ///< Whether ignoring spaces after text or not. Default is true.
};
} // namespace Layout
};
} // namespace Layout