diff options
| author | Paul Wisbey <p.wisbey@samsung.com> | 2016-06-02 10:03:08 -0700 |
|---|---|---|
| committer | Gerrit Code Review <gerrit@review.vlan103.tizen.org> | 2016-06-02 10:03:08 -0700 |
| commit | f3d4602ba67f66b6cedd9721765895e673bdb9b8 (patch) | |
| tree | 94f85d8ce0480873016b14a3f8bbb34576158db3 /demo | |
| parent | 8703f6e3f98f81e8d500d8c494a6ef50374b3162 (diff) | |
| parent | 5a4451e7d405fb19449cde5002de20cd2ae0add7 (diff) | |
| download | dali-demo-f3d4602ba67f66b6cedd9721765895e673bdb9b8.tar.gz dali-demo-f3d4602ba67f66b6cedd9721765895e673bdb9b8.tar.bz2 dali-demo-f3d4602ba67f66b6cedd9721765895e673bdb9b8.zip | |
Merge "Simple TextEditor demo." into devel/master
Diffstat (limited to 'demo')
| -rw-r--r-- | demo/dali-demo.cpp | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/demo/dali-demo.cpp b/demo/dali-demo.cpp index c3b628bb..3f693a73 100644 --- a/demo/dali-demo.cpp +++ b/demo/dali-demo.cpp @@ -58,6 +58,7 @@ int DALI_EXPORT_API main(int argc, char **argv) demo.AddExample(Example("text-label-multi-language.example", DALI_DEMO_STR_TITLE_TEXT_LABEL_MULTI_LANGUAGE)); demo.AddExample(Example("text-label-emojis.example", DALI_DEMO_STR_TITLE_EMOJI_TEXT)); demo.AddExample(Example("text-scrolling.example", DALI_DEMO_STR_TITLE_TEXT_SCROLLING)); + demo.AddExample(Example("text-editor.example", DALI_DEMO_STR_TITLE_TEXT_EDITOR)); demo.AddExample(Example("size-negotiation.example", DALI_DEMO_STR_TITLE_NEGOTIATE_SIZE)); demo.AddExample(Example("popup.example", DALI_DEMO_STR_TITLE_POPUP)); demo.AddExample(Example("buttons.example", DALI_DEMO_STR_TITLE_BUTTONS)); |