aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBoris Faure <billiob@gmail.com>2018-03-12 14:48:50 +0100
committerBoris Faure <billiob@gmail.com>2018-03-12 15:00:08 +0100
commitbf110393b69954c0a172b0e1f8865aac59606da5 (patch)
treeb9e48554fccc1e5a3a9f41a0d6fb0e6afe7d7074
parenttermptyesc: handle CMY/CMYK in SGR38/SGR48. Ref T746 (diff)
downloadterminology-bf110393b69954c0a172b0e1f8865aac59606da5.tar.gz
meson: detect 'offscale' support in edje_cc. Closes https://phab.enlightenment.org/T6770
-rw-r--r--data/test_offscale.edc11
-rw-r--r--data/themes/default.edc6
-rw-r--r--data/themes/meson.build1
-rw-r--r--meson.build9
4 files changed, 27 insertions, 0 deletions
diff --git a/data/test_offscale.edc b/data/test_offscale.edc
new file mode 100644
index 0000000..78a8d05
--- /dev/null
+++ b/data/test_offscale.edc
@@ -0,0 +1,11 @@
+collections {
+ group { name: "offscale_test";
+ parts {
+ part { name: "offscale_part";
+ description { state: "default" 0.0;
+ offscale;
+ }
+ }
+ }
+ }
+}
diff --git a/data/themes/default.edc b/data/themes/default.edc
index ba4e90d..715f931 100644
--- a/data/themes/default.edc
+++ b/data/themes/default.edc
@@ -697,7 +697,9 @@ collections {
rel.to: "sendfile_request_bg";
rel1.offset: 4 4;
rel2.offset: -5 -5;
+#if HAS_OFFSCALE
offscale;
+#endif
}
description { state: "on" 0.0;
inherit: "default" 0.0;
@@ -767,7 +769,9 @@ collections {
rel.to: "terminology.sendfile.progress";
rel1.offset: -4 -4;
rel2.offset: 4 4;
+#if HAS_OFFSCALE
offscale;
+#endif
}
}
part { name: "terminology.sendfile.progress"; type: SWALLOW;
@@ -779,7 +783,9 @@ collections {
rel2.relative: 1.0 0.0;
rel2.offset: -5 -5;
align: 0.5 1.0;
+#if HAS_OFFSCALE
offscale;
+#endif
}
description { state: "on" 0.0;
inherit: "default" 0.0;
diff --git a/data/themes/meson.build b/data/themes/meson.build
index 4397d72..4eeaa68 100644
--- a/data/themes/meson.build
+++ b/data/themes/meson.build
@@ -1,4 +1,5 @@
command = [edje_cc,
+ edje_offscale,
'-id', join_paths(meson.source_root(), 'data', 'themes', 'images'),
'-fd', join_paths(meson.source_root(), 'data', 'fonts'),
'-sd', join_paths(meson.source_root(), 'data', 'themes', 'sounds'),
diff --git a/meson.build b/meson.build
index bf7df38..0459805 100644
--- a/meson.build
+++ b/meson.build
@@ -97,6 +97,15 @@ if edje_cc == ''
edje_cc = edje_cc_path
endif
+res = run_command(edje_cc, meson.current_source_dir() + '/data/test_offscale.edc')
+if res.returncode() == 0
+ message('edje_cc has support for offscale')
+ edje_offscale='-DHAS_OFFSCALE=1'
+else
+ message('edje_cc does not have support for offscale')
+ edje_offscale='-DHAS_OFFSCALE=0'
+endif
+
fuzzing = get_option('fuzzing')
if fuzzing