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
[dali_2.1.6] Merge branch 'devel/master'
[platform/core/uifw/dali-toolkit.git]
/
dali-toolkit
/
internal
/
text
/
text-controller-text-updater.cpp
diff --git
a/dali-toolkit/internal/text/text-controller-text-updater.cpp
b/dali-toolkit/internal/text/text-controller-text-updater.cpp
index
0bcb97f
..
caf44f7
100644
(file)
--- a/
dali-toolkit/internal/text/text-controller-text-updater.cpp
+++ b/
dali-toolkit/internal/text/text-controller-text-updater.cpp
@@
-1,5
+1,5
@@
/*
/*
- * Copyright (c) 202
1
Samsung Electronics Co., Ltd.
+ * Copyright (c) 202
2
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.
@@
-90,7
+90,8
@@
void Controller::TextUpdater::SetText(Controller& controller, const std::string&
logicalModel->mEmbeddedItems,
logicalModel->mAnchors,
logicalModel->mUnderlinedCharacterRuns,
logicalModel->mEmbeddedItems,
logicalModel->mAnchors,
logicalModel->mUnderlinedCharacterRuns,
- logicalModel->mBackgroundColorRuns);
+ logicalModel->mBackgroundColorRuns,
+ logicalModel->mStrikethroughCharacterRuns);
Length textSize = 0u;
const uint8_t* utf8 = NULL;
Length textSize = 0u;
const uint8_t* utf8 = NULL;
@@
-351,7
+352,7
@@
void Controller::TextUpdater::InsertText(Controller& controller, const std::stri
if(addFontSizeRun)
{
if(addFontSizeRun)
{
- fontDescriptionRun.size = static_cast<PointSize26Dot6>(inputStyle.size * impl.
mFontSizeScale
* 64.f);
+ fontDescriptionRun.size = static_cast<PointSize26Dot6>(inputStyle.size * impl.
GetFontSizeScale()
* 64.f);
fontDescriptionRun.sizeDefined = true;
}
fontDescriptionRun.sizeDefined = true;
}