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 "Apply font size scale to markup text" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
dali-toolkit-test-utils
/
toolkit-text-utils.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
b/automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
index
065e5fd
..
1e4dfe1
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/dali-toolkit-test-utils/toolkit-text-utils.cpp
@@
-28,11
+28,11
@@
#include <dali-toolkit/internal/text/hyphenator.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
#include <dali-toolkit/internal/text/hyphenator.h>
#include <dali-toolkit/internal/text/layouts/layout-engine.h>
#include <dali-toolkit/internal/text/layouts/layout-parameters.h>
-#include <dali-toolkit/internal/text/markup-processor.h>
+#include <dali-toolkit/internal/text/markup-processor
/markup-processor
.h>
#include <dali-toolkit/internal/text/multi-language-support.h>
#include <dali-toolkit/internal/text/segmentation.h>
#include <dali-toolkit/internal/text/shaper.h>
#include <dali-toolkit/internal/text/multi-language-support.h>
#include <dali-toolkit/internal/text/segmentation.h>
#include <dali-toolkit/internal/text/shaper.h>
-#include <dali-toolkit/internal/text/text-controller-impl.h>
+#include <dali-toolkit/internal/text/
controller/
text-controller-impl.h>
namespace Dali
{
namespace Dali
{
@@
-115,7
+115,9
@@
void CreateTextModel(const std::string& text,
logicalModel->mAnchors,
logicalModel->mUnderlinedCharacterRuns,
logicalModel->mBackgroundColorRuns,
logicalModel->mAnchors,
logicalModel->mUnderlinedCharacterRuns,
logicalModel->mBackgroundColorRuns,
- logicalModel->mStrikethroughCharacterRuns);
+ logicalModel->mStrikethroughCharacterRuns,
+ logicalModel->mBoundedParagraphRuns,
+ logicalModel->mCharacterSpacingCharacterRuns);
Length textSize = 0u;
const uint8_t* utf8 = NULL;
Length textSize = 0u;
const uint8_t* utf8 = NULL;
@@
-227,6
+229,7
@@
void CreateTextModel(const std::string& text,
fontDescriptionRuns,
fontDescription,
TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
fontDescriptionRuns,
fontDescription,
TextAbstraction::FontClient::DEFAULT_POINT_SIZE,
+ 1.0f,
0u,
characterCount,
validFonts);
0u,
characterCount,
validFonts);
@@
-349,11
+352,15
@@
void CreateTextModel(const std::string& text,
layoutParameters.startLineIndex = 0u;
layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count();
layoutParameters.startLineIndex = 0u;
layoutParameters.estimatedNumberOfLines = logicalModel->mParagraphInfo.Count();
- bool isAutoScroll = false;
+ bool isAutoScroll = false;
+ bool isAutoScrollMaxTextureExceeded = false;
+ bool isHiddenInputEnabled = false;
layoutEngine.LayoutText(layoutParameters,
layoutSize,
false,
isAutoScroll,
layoutEngine.LayoutText(layoutParameters,
layoutSize,
false,
isAutoScroll,
+ isAutoScrollMaxTextureExceeded,
+ isHiddenInputEnabled,
ellipsisPosition);
if(options.align)
ellipsisPosition);
if(options.align)