diff options
| author | Victor Cebollada <v.cebollada@samsung.com> | 2016-10-27 08:53:34 +0100 |
|---|---|---|
| committer | Victor Cebollada <v.cebollada@samsung.com> | 2016-10-27 08:53:34 +0100 |
| commit | b9b579add389a1634cd5b6e7b39e2f0d3bb9e18d (patch) | |
| tree | 005cf1411e3657f0804f226062db68ebbd427362 /shared | |
| parent | 30c8f79173666ffe7b94364e233e25e686f198fb (diff) | |
| download | dali-demo-b9b579add389a1634cd5b6e7b39e2f0d3bb9e18d.tar.gz dali-demo-b9b579add389a1634cd5b6e7b39e2f0d3bb9e18d.tar.bz2 dali-demo-b9b579add389a1634cd5b6e7b39e2f0d3bb9e18d.zip | |
Update json style files with the new 'fontStyle' format.
* See 'Text - FONT_STYLE and INPUT_FONT_STYLE properties refactor' patch in toolkit.
Change-Id: I2d2312a6ee7acdadc72e2af1ad4875dbc450eaef
Signed-off-by: Victor Cebollada <v.cebollada@samsung.com>
Diffstat (limited to 'shared')
| -rw-r--r-- | shared/view.h | 1 |
1 files changed, 0 insertions, 1 deletions
diff --git a/shared/view.h b/shared/view.h index 29e1012d..6ec55d0f 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); |