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 "Add property ENABLE_GRAB_HANDLE_POPUP to TextEditor" into devel/master
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
devel-api
/
text
/
text-utils-devel.cpp
diff --git
a/dali-toolkit/devel-api/text/text-utils-devel.cpp
b/dali-toolkit/devel-api/text/text-utils-devel.cpp
old mode 100755
(executable)
new mode 100644
(file)
index
e5ad925
..
a4dbce4
--- a/
dali-toolkit/devel-api/text/text-utils-devel.cpp
+++ b/
dali-toolkit/devel-api/text/text-utils-devel.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
0
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
1
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.
@@
-172,7
+172,9
@@
void ShapeTextPreprocess(const RendererParameters& textParameters, TextAbstracti
MarkupProcessData markupProcessData(colorRuns,
fontDescriptionRuns,
MarkupProcessData markupProcessData(colorRuns,
fontDescriptionRuns,
- textModel->mLogicalModel->mEmbeddedItems);
+ textModel->mLogicalModel->mEmbeddedItems,
+ textModel->mLogicalModel->mAnchors,
+ textModel->mLogicalModel->mUnderlinedCharacterRuns);
if(textParameters.markupEnabled)
{
if(textParameters.markupEnabled)
{
@@
-1013,12
+1015,11
@@
Size LayoutText(const RendererParameters& textParameters, TextAbstraction::TextR
// Set the layout parameters.
Size textLayoutArea = Size(static_cast<float>(textParameters.textWidth),
// Set the layout parameters.
Size textLayoutArea = Size(static_cast<float>(textParameters.textWidth),
-
static_cast<float>(textParameters.textHeight));
+ static_cast<float>(textParameters.textHeight));
// padding
// padding
- Extents padding = textParameters.padding;
- internalDataModel.textLayoutArea = Size(textLayoutArea.x - ( padding.start + padding.end ), textLayoutArea.y - ( padding.top + padding.bottom ) );
-
+ Extents padding = textParameters.padding;
+ internalDataModel.textLayoutArea = Size(textLayoutArea.x - (padding.start + padding.end), textLayoutArea.y - (padding.top + padding.bottom));
if(isCircularTextLayout)
{
if(isCircularTextLayout)
{
@@
-1029,7
+1030,7
@@
Size LayoutText(const RendererParameters& textParameters, TextAbstraction::TextR
// Resize the vector of positions to have the same size than the vector of glyphs.
rendererParameters.positions.Resize(numberOfGlyphs);
// Resize the vector of positions to have the same size than the vector of glyphs.
rendererParameters.positions.Resize(numberOfGlyphs);
- textModel->mLineWrapMode = LineWrap::WORD;
+ textModel->mLineWrapMode =
Text::
LineWrap::WORD;
textModel->mIgnoreSpacesAfterText = false;
textModel->mMatchSystemLanguageDirection = false;
Text::Layout::Parameters layoutParameters(internalDataModel.textLayoutArea,
textModel->mIgnoreSpacesAfterText = false;
textModel->mMatchSystemLanguageDirection = false;
Text::Layout::Parameters layoutParameters(internalDataModel.textLayoutArea,