diff --git a/resources/style/demo-theme.json.in b/resources/style/demo-theme.json.in index 8cf572d..f9c0d99 100644 --- a/resources/style/demo-theme.json.in +++ b/resources/style/demo-theme.json.in @@ -27,7 +27,7 @@ }, "TextLabel": { - "fontStyle":"Regular", + "fontStyle":{"weight":"normal"}, "pointSize":18 }, "LauncherLabel": diff --git a/resources/style/mobile/demo-theme.json.in b/resources/style/mobile/demo-theme.json.in index f8b5099..f42198e 100644 --- a/resources/style/mobile/demo-theme.json.in +++ b/resources/style/mobile/demo-theme.json.in @@ -24,7 +24,7 @@ }, "TextLabel": { - "fontStyle":"Regular", + "fontStyle":{"weight":"normal"}, "pointSize":18 }, "TextLabelFontSize0": diff --git a/shared/view.h b/shared/view.h index 29e1012..6ec55d0 100644 --- a/shared/view.h +++ b/shared/view.h @@ -46,7 +46,6 @@ struct ViewStyle const ViewStyle DEFAULT_VIEW_STYLE( 0.1f, 0.7f, 80.f, 4.f ); const char* DEFAULT_TEXT_STYLE_FONT_FAMILY("HelveticaNue"); -const char* DEFAULT_TEXT_STYLE_FONT_STYLE("Regular"); const float DEFAULT_TEXT_STYLE_POINT_SIZE( 8.0f ); const Dali::Toolkit::Alignment::Padding DEFAULT_PLAY_PADDING(12.0f, 12.0f, 12.0f, 12.0f);