Commit e706ae508fdbe8c6fc034446b84f22561db911f3
[dali_1.3.6] Merge branch 'devel/master'
Change-Id: Ieebe53db59305ab50fcc327b8b6bb25c0bc5b229
Showing
2 changed files
with
11 additions
and
2 deletions
examples/text-memory-profiling/text-memory-profiling-example.cpp
| @@ -45,6 +45,7 @@ enum TextType | @@ -45,6 +45,7 @@ enum TextType | ||
| 45 | MULTI_COLOR_TEXT_WITH_STYLE, | 45 | MULTI_COLOR_TEXT_WITH_STYLE, |
| 46 | MULTI_COLOR_TEXT_WITH_EMOJI, | 46 | MULTI_COLOR_TEXT_WITH_EMOJI, |
| 47 | MULTI_COLOR_TEXT_WITH_STYLE_EMOJI, | 47 | MULTI_COLOR_TEXT_WITH_STYLE_EMOJI, |
| 48 | + SMALL_TEXT_IN_LARGE_TEXT_LABEL, | ||
| 48 | NUMBER_OF_TYPES | 49 | NUMBER_OF_TYPES |
| 49 | }; | 50 | }; |
| 50 | 51 | ||
| @@ -57,7 +58,8 @@ std::string TEXT_TYPE_STRING[ NUMBER_OF_TYPES ] = | @@ -57,7 +58,8 @@ std::string TEXT_TYPE_STRING[ NUMBER_OF_TYPES ] = | ||
| 57 | "Multi color text", | 58 | "Multi color text", |
| 58 | "Multi color text with style", | 59 | "Multi color text with style", |
| 59 | "Multi color text with emoji", | 60 | "Multi color text with emoji", |
| 60 | - "Multi color text with style and emoji" | 61 | + "Multi color text with style and emoji", |
| 62 | + "Small text in large Text Label" | ||
| 61 | }; | 63 | }; |
| 62 | 64 | ||
| 63 | const int NUMBER_OF_LABELS = 500; | 65 | const int NUMBER_OF_LABELS = 500; |
| @@ -156,6 +158,13 @@ public: | @@ -156,6 +158,13 @@ public: | ||
| 156 | label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) ); | 158 | label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 2.0f, 2.0f ) ); |
| 157 | break; | 159 | break; |
| 158 | } | 160 | } |
| 161 | + case SMALL_TEXT_IN_LARGE_TEXT_LABEL: | ||
| 162 | + { | ||
| 163 | + label.SetProperty( TextLabel::Property::TEXT, "A Quick Brown Fox Jumps Over The Lazy Dog" ); | ||
| 164 | + label.SetProperty( TextLabel::Property::SHADOW_OFFSET, Vector2( 0.0f, 0.0f ) ); | ||
| 165 | + label.SetSize(stageSize.x, stageSize.y * 0.25f); // Set the text label in larger size | ||
| 166 | + break; | ||
| 167 | + } | ||
| 159 | default: | 168 | default: |
| 160 | break; | 169 | break; |
| 161 | } | 170 | } |
packaging/com.samsung.dali-demo.spec
| @@ -2,7 +2,7 @@ | @@ -2,7 +2,7 @@ | ||
| 2 | 2 | ||
| 3 | Name: com.samsung.dali-demo | 3 | Name: com.samsung.dali-demo |
| 4 | Summary: The OpenGLES Canvas Core Demo | 4 | Summary: The OpenGLES Canvas Core Demo |
| 5 | -Version: 1.3.5 | 5 | +Version: 1.3.6 |
| 6 | Release: 1 | 6 | Release: 1 |
| 7 | Group: System/Libraries | 7 | Group: System/Libraries |
| 8 | License: Apache-2.0 | 8 | License: Apache-2.0 |