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 option to test harness execution to only summarize failures" into devel...
[platform/core/uifw/dali-toolkit.git]
/
automated-tests
/
src
/
dali-toolkit-internal
/
utc-Dali-Text-Typesetter.cpp
diff --git
a/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
b/automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
index
63f9a22
..
e742a9e
100644
(file)
--- a/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
+++ b/
automated-tests/src/dali-toolkit-internal/utc-Dali-Text-Typesetter.cpp
@@
-35,7
+35,7
@@
using namespace Text;
namespace
{
const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
namespace
{
const std::string DEFAULT_FONT_DIR( "/resources/fonts" );
-const PointSize26Dot6 EMOJI_FONT_SIZE =
62u * 64u;
+const PointSize26Dot6 EMOJI_FONT_SIZE =
3840u; // 60 * 64
} // namespace
int UtcDaliTextTypesetter(void)
} // namespace
int UtcDaliTextTypesetter(void)
@@
-86,7
+86,7
@@
int UtcDaliTextRenderingControllerRender(void)
const std::string pathName( pathNamePtr );
free( pathNamePtr );
const std::string pathName( pathNamePtr );
free( pathNamePtr );
- fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/
Tizen
ColorEmoji.ttf", EMOJI_FONT_SIZE );
+ fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/
Breeze
ColorEmoji.ttf", EMOJI_FONT_SIZE );
fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
// Creates a text controller.
fontClient.GetFontId( pathName + DEFAULT_FONT_DIR + "/tizen/TizenSansRegular.ttf" );
// Creates a text controller.
@@
-97,7
+97,7
@@
int UtcDaliTextRenderingControllerRender(void)
// Sets the text.
controller->SetMarkupProcessorEnabled( true );
// Sets the text.
controller->SetMarkupProcessorEnabled( true );
- controller->SetText( "<font family='TizenSansRegular'>Hello world </font><font family='
Tizen
ColorEmoji'>\xF0\x9F\x98\x81</font>" );
+ controller->SetText( "<font family='TizenSansRegular'>Hello world </font><font family='
Breeze
ColorEmoji'>\xF0\x9F\x98\x81</font>" );
// Creates the text's model and relais-out the text.
const Size relayoutSize( 120.f, 60.f );
// Creates the text's model and relais-out the text.
const Size relayoutSize( 120.f, 60.f );