summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-09-10 14:53:48 +0900
committerHermet Park <hermetpark@gmail.com>2019-09-10 14:53:48 +0900
commit7cc63b9b8fd6fd7d79355b2a8d87ee718ccd1ef1 (patch)
tree26e71691b1b673d2878e66c940a4abd83d506b7c /doc
parent7b0dd3a16f5b8fb02aa97ad8074bcfe599f9a584 (diff)
parent267c57d0f10d4b1577181c8f7157b7bc2f8053a6 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'doc')
-rw-r--r--doc/index_elm.dox4
-rw-r--r--doc/meson.build7
-rw-r--r--doc/widgets/widget_preview_nstate.c10
3 files changed, 5 insertions, 16 deletions
diff --git a/doc/index_elm.dox b/doc/index_elm.dox
index effe1aed35..b85703fd5a 100644
--- a/doc/index_elm.dox
+++ b/doc/index_elm.dox
@@ -175,10 +175,6 @@
175 * 175 *
176 * @image html img/widget/notify/preview-00.png 176 * @image html img/widget/notify/preview-00.png
177 * @image latex img/widget/notify/preview-00.eps 177 * @image latex img/widget/notify/preview-00.eps
178 * @li @ref Elm_Nstate
179 *
180 * @image html img/widget/nstate/preview-00.png
181 * @image latex img/widget/nstate/preview-00.eps
182 * @li @ref Elm_Panel 178 * @li @ref Elm_Panel
183 * 179 *
184 * @image html img/widget/panel/preview-00.png 180 * @image html img/widget/panel/preview-00.png
diff --git a/doc/meson.build b/doc/meson.build
index a362c6d2ba..b6bce8bf52 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -66,7 +66,6 @@ widget_previews = [
66 ['mapbuf', 'preview-00.png', 'widget_preview_mapbuf', '200', '200'], 66 ['mapbuf', 'preview-00.png', 'widget_preview_mapbuf', '200', '200'],
67 ['menu', 'preview-00.png', 'widget_preview_menu', '100', '100'], 67 ['menu', 'preview-00.png', 'widget_preview_menu', '100', '100'],
68 ['notify', 'preview-00.png', 'widget_preview_notify', '60', '30'], 68 ['notify', 'preview-00.png', 'widget_preview_notify', '60', '30'],
69 ['nstate', 'preview-00.png', 'widget_preview_nstate', '45', '28'],
70 ['panel', 'preview-00.png', 'widget_preview_panel', '150', '50'], 69 ['panel', 'preview-00.png', 'widget_preview_panel', '150', '50'],
71 ['panes', 'preview-00.png', 'widget_preview_panes', '200', '100'], 70 ['panes', 'preview-00.png', 'widget_preview_panes', '200', '100'],
72 ['photocam', 'preview-00.png', 'widget_preview_photocam', '243', '162'], 71 ['photocam', 'preview-00.png', 'widget_preview_photocam', '243', '162'],
@@ -114,7 +113,11 @@ foreach text_filter_property : text_filter_properties
114 filter_code = run_command('cat', join_paths(meson.source_root(), 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua')) 113 filter_code = run_command('cat', join_paths(meson.source_root(), 'src', 'examples', 'evas', 'filters', 'filter_'+name+'.lua'))
115 114
116 doc_target += custom_target('preview_text_filters_'+name, 115 doc_target += custom_target('preview_text_filters_'+name,
117 command: [env, 'EFL_RUN_IN_TREE=1', preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size], 116 command: [
117 env, 'EFL_RUN_IN_TREE=1',
118 'EFL_EVAS_FILTER_LUA_PREFIX=' + join_paths(meson.source_root(), 'src', 'lib', 'evas'),
119 preview_text_filter.full_path(), text, filter_code.stdout(), '@OUTPUT@', font, size
120 ],
118 depends: preview_text_filter, 121 depends: preview_text_filter,
119 output: 'filter_'+name+'.png', 122 output: 'filter_'+name+'.png',
120 build_by_default: false 123 build_by_default: false
diff --git a/doc/widgets/widget_preview_nstate.c b/doc/widgets/widget_preview_nstate.c
deleted file mode 100644
index d1fc3d1e4b..0000000000
--- a/doc/widgets/widget_preview_nstate.c
+++ /dev/null
@@ -1,10 +0,0 @@
1#include "widget_preview_tmpl_head.c"
2
3Evas_Object *o = efl_add(EFL_UI_NSTATE_CLASS, win);
4evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
5elm_win_resize_object_add(win, o);
6evas_object_show(o);
7
8elm_object_text_set(o, "Nstate");
9
10#include "widget_preview_tmpl_foot.c"