Peter M. Groen / dali-demo

Commit 0cf88cf7443709f0f090f1666042e1fddd6eb550

Authored by Paul Wisbey
Committed by Gerrit Code Review
2 parents 893be957 b9b579ad

Merge "Update json style files with the new 'fontStyle' format." into devel/master

Inline Side-by-side
Showing 3 changed files with 2 additions and 3 deletions
resources/style/demo-theme.json.in
  View file @0cf88cf
@@ -27,7 +27,7 @@ @@ -27,7 +27,7 @@
27 }, 27 },
28 "TextLabel": 28 "TextLabel":
29 { 29 {
30 - "fontStyle":"Regular", 30 + "fontStyle":{"weight":"normal"},
31 "pointSize":18 31 "pointSize":18
32 }, 32 },
33 "LauncherLabel": 33 "LauncherLabel":
resources/style/mobile/demo-theme.json.in
  View file @0cf88cf
@@ -24,7 +24,7 @@ @@ -24,7 +24,7 @@
24 }, 24 },
25 "TextLabel": 25 "TextLabel":
26 { 26 {
27 - "fontStyle":"Regular", 27 + "fontStyle":{"weight":"normal"},
28 "pointSize":18 28 "pointSize":18
29 }, 29 },
30 "TextLabelFontSize0": 30 "TextLabelFontSize0":
shared/view.h
  View file @0cf88cf
@@ -46,7 +46,6 @@ struct ViewStyle @@ -46,7 +46,6 @@ struct ViewStyle
46 const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f ); 46 const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f );
47 47
48 const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue"); 48 const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue");
49 -const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular");  
50 const float DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f ); 49 const float DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f );
51 50
52 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f); 51 const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);