Peter M. Groen / dali-demo

Commit 373991cba80559b14d9788b6a09f139286688941

Authored by Paul Wisbey
1 parent 0f2248c2

Reduced text size for launcher labels 

Change-Id: Idcaadfcdcc7b30aef0a13d7ccbda0ee250c0d15a
Inline Side-by-side
Showing 4 changed files with 5 additions and 3 deletions
demo/dali-demo.cpp
  View file @373991c
@@ -57,7 +57,7 @@ int main(int argc, char **argv) @@ -57,7 +57,7 @@ int main(int argc, char **argv)
57 demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT)); 57 demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT));
58 demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)); 58 demo.AddExample(Example("animated-shapes.example", DALI_DEMO_STR_TITLE_ANIMATED_SHAPES));
59 demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION)); 59 demo.AddExample(Example("path-animation.example", DALI_DEMO_STR_TITLE_PATH_ANIMATION));
60 - demo.AddExample(Example("size-negotiation.example", "Size Negotiation")); 60 + demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE));
61 61
62 demo.SortAlphabetically( true ); 62 demo.SortAlphabetically( true );
63 63
examples/size-negotiation/size-negotiation-example.cpp
  View file @373991c
@@ -40,7 +40,7 @@ namespace @@ -40,7 +40,7 @@ namespace
40 const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg"; 40 const char* const BACKGROUND_IMAGE = DALI_IMAGE_DIR "background-gradient.jpg";
41 const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png"; 41 const char* const TOOLBAR_IMAGE = DALI_IMAGE_DIR "top-bar.png";
42 42
43 -const char* const TOOLBAR_TITLE = "Size Negotiation"; 43 +const char* const TOOLBAR_TITLE = "Negotiate Size";
44 const int TOOLBAR_HEIGHT = 62; 44 const int TOOLBAR_HEIGHT = 62;
45 45
46 const char* MENU_ICON_IMAGE = DALI_IMAGE_DIR "icon-cluster-none.png"; 46 const char* MENU_ICON_IMAGE = DALI_IMAGE_DIR "icon-cluster-none.png";
resources/style/mobile/demo-theme.json
  View file @373991c
@@ -51,7 +51,7 @@ distributing this software or its derivatives. @@ -51,7 +51,7 @@ distributing this software or its derivatives.
51 51
52 "launcherlabel": 52 "launcherlabel":
53 { 53 {
54 - "point-size":10 54 + "point-size":8
55 }, 55 },
56 56
57 "toolbarlabel": 57 "toolbarlabel":
shared/dali-demo-strings.h
  View file @373991c
@@ -53,6 +53,7 @@ extern "C" @@ -53,6 +53,7 @@ extern "C"
53 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT") 53 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT dgettext(DALI_DEMO_DOMAIN_LOCAL, "DALI_DEMO_STR_TITLE_EMOJI_TEXT")
54 #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES) 54 #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES dgettext(DALI_DEMO_STR_TITLE_ANIMATED_SHAPES)
55 #define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION) 55 #define DALI_DEMO_STR_TITLE_PATH_ANIMATION dgettext(DALI_DEMO_STR_TITLE_PATH_ANIMATION)
  56 +#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE dgettext(DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE)
56 57
57 #else // !INTERNATIONALIZATION_ENABLED 58 #else // !INTERNATIONALIZATION_ENABLED
58 59
@@ -77,6 +78,7 @@ extern "C" @@ -77,6 +78,7 @@ extern "C"
77 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text" 78 #define DALI_DEMO_STR_TITLE_EMOJI_TEXT "Emoji Text"
78 #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES "Animated Shapes" 79 #define DALI_DEMO_STR_TITLE_ANIMATED_SHAPES "Animated Shapes"
79 #define DALI_DEMO_STR_TITLE_PATH_ANIMATION "Animated Path" 80 #define DALI_DEMO_STR_TITLE_PATH_ANIMATION "Animated Path"
  81 +#define DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE "Negotiate Size"
80 82
81 #endif 83 #endif
82 84