From 373991cba80559b14d9788b6a09f139286688941 Mon Sep 17 00:00:00 2001
From: Paul Wisbey
Date: Mon, 13 Apr 2015 10:04:01 +0100
Subject: [PATCH] Reduced text size for launcher labels
Change-Id: Idcaadfcdcc7b30aef0a13d7ccbda0ee250c0d15a
---
demo/dali-demo.cpp | 2 +-
examples/size-negotiation/size-negotiation-example.cpp | 2 +-
resources/style/mobile/demo-theme.json | 2 +-
shared/dali-demo-strings.h | 2 ++
4 files changed, 5 insertions(+), 3 deletions(-)
diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp
index a7b456d..8c43418 100644
--- a/demo/dali-demo.cpp
+++ b/demo/dali-demo.cpp
@@ -57,7 +57,7 @@ int main(int argc, char **argv)
demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION));
- demo.AddExample(Example("size-negotiation.example", "Size Negotiation"));
+ demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE));
demo.SortAlphabetically( true );
diff --git a/examples/size-negotiation/size-negotiation-example.cpp b/examples/size-negotiation/size-negotiation-example.cpp
index 4e5c16b..2712ab2 100644
--- a/examples/size-negotiation/size-negotiation-example.cpp
+++ b/examples/size-negotiation/size-negotiation-example.cpp
@@ -40,7 +40,7 @@ namespace
const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";
const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png";
-const char* const TOOLBAR_TITLE = "Size Negotiation";
+const char* const TOOLBAR_TITLE = "Negotiate Size";
const int TOOLBAR_HEIGHT = 62;
const char* MENU_ICON_IMAGE = DALI_IMAGE_DIR "icon-cluster-none.png";
diff --git a/resources/style/mobile/demo-theme.json b/resources/style/mobile/demo-theme.json
index 7ecff98..682db8e 100644
--- a/resources/style/mobile/demo-theme.json
+++ b/resources/style/mobile/demo-theme.json
@@ -51,7 +51,7 @@ distributing this software or its derivatives.
"launcherlabel":
{
- "point-size":10
+ "point-size":8
},
"toolbarlabel":
diff --git a/shared/dali-demo-strings.h b/shared/dali-demo-strings.h
index 6354fa9..5d54d63 100644
--- a/shared/dali-demo-strings.h
+++ b/shared/dali-demo-strings.h
@@ -53,6 +53,7 @@ extern "C"
#define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)
#define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION)
+#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE)
#else // !INTERNATIONALIZATION_ENABLED
@@ -77,6 +78,7 @@ extern "C"
#define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"
#define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES "Animated Shapes"
#define DALI_DEMO_STR_TITLE_PATH_ANIMATION "Animated Path"
+#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE "Negotiate Size"
#endif
--
2.7.4