summaryrefslogtreecommitdiff
path: root/doc
diff options
context:
space:
mode:
authorHermet Park <hermetpark@gmail.com>2019-10-07 15:56:56 +0900
committerHermet Park <hermetpark@gmail.com>2019-10-07 15:56:56 +0900
commit7b3036a992ad577ae535743346b3fa1ea8941130 (patch)
treec7e1db8362abea88f8c40d0d2526aada79563cf9 /doc
parent4ea78b845106870619dcdcbf50529c4c99c5294c (diff)
parentf8e027c3954beaef4c5302402fca4d7715b5cec5 (diff)
Merge branch 'master' into devs/hermet/lottie
Diffstat (limited to 'doc')
-rw-r--r--doc/meson.build6
-rw-r--r--doc/widgets/widget_preview_colorselector.c1
2 files changed, 4 insertions, 3 deletions
diff --git a/doc/meson.build b/doc/meson.build
index 11e80dfadc..5598b18ba3 100644
--- a/doc/meson.build
+++ b/doc/meson.build
@@ -133,7 +133,7 @@ foreach widget_preview : widget_previews
133 dependencies: elementary, 133 dependencies: elementary,
134 build_by_default: false, 134 build_by_default: false,
135 c_args : [ 135 c_args : [
136 '-DPACKAGE_DATA_DIR="'+meson.current_build_dir()+'"', 136 '-DPACKAGE_DATA_DIR="'+join_paths(meson.source_root(), 'data', 'elementary')+'"',
137 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"', 137 '-DTESTS_BUILD_DIR="'+meson.current_build_dir()+'"',
138 '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"', 138 '-DTESTS_SRC_DIR="'+meson.current_source_dir()+'"',
139 '-DDOCW_DIR="'+meson.current_build_dir()+'"'] 139 '-DDOCW_DIR="'+meson.current_build_dir()+'"']
@@ -182,8 +182,8 @@ doc_target += custom_target('doxygen',
182) 182)
183 183
184compress_target = custom_target('package_doc_tar', 184compress_target = custom_target('package_doc_tar',
185 command: [tar, '-C', meson.build_root(), '-cf', 'efl-'+meson.project_version()+'.tar', 'html', 'man'], 185 command: [tar, '-C', meson.build_root(), '--xz', '-cf', 'efl-'+meson.project_version()+'-doc.tar.xz', 'html', 'man'],
186 output: 'efl-'+meson.project_version()+'.tar', 186 output: 'efl-'+meson.project_version()+'-doc.tar.xz',
187 depends: doc_target, 187 depends: doc_target,
188 build_by_default: false 188 build_by_default: false
189) 189)
diff --git a/doc/widgets/widget_preview_colorselector.c b/doc/widgets/widget_preview_colorselector.c
index 784a2d67b4..48b3daca29 100644
--- a/doc/widgets/widget_preview_colorselector.c
+++ b/doc/widgets/widget_preview_colorselector.c
@@ -8,6 +8,7 @@ evas_object_show(bx);
8Evas_Object *o = elm_colorselector_add(win); 8Evas_Object *o = elm_colorselector_add(win);
9evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND); 9evas_object_size_hint_weight_set(o, EVAS_HINT_EXPAND, EVAS_HINT_EXPAND);
10evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);; 10evas_object_size_hint_align_set(o, EVAS_HINT_FILL, EVAS_HINT_FILL);;
11elm_colorselector_palette_item_selected_set(eina_list_data_get(elm_colorselector_palette_items_get(o)), EINA_TRUE);
11elm_box_pack_end(bx, o); 12elm_box_pack_end(bx, o);
12evas_object_show(o); 13evas_object_show(o);
13 14