On Mon, 12 Mar 2018 07:02:26 -0700 Boris Faure <bill...@gmail.com> said:

oh my bad. i used offscale - an efl git feature in the terminology theme...
oooops! sorry! :)

> billiob pushed a commit to branch master.
> 
> http://git.enlightenment.org/apps/terminology.git/commit/?id=bf110393b69954c0a172b0e1f8865aac59606da5
> 
> commit bf110393b69954c0a172b0e1f8865aac59606da5
> Author: Boris Faure <bill...@gmail.com>
> Date:   Mon Mar 12 14:48:50 2018 +0100
> 
>     meson: detect 'offscale' support in edje_cc. Closes T6770
> ---
>  data/test_offscale.edc  | 11 +++++++++++
>  data/themes/default.edc |  6 ++++++
>  data/themes/meson.build |  1 +
>  meson.build             |  9 +++++++++
>  4 files changed, 27 insertions(+)
> 
> 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
> 
> -- 
> 
> 


-- 
------------- Codito, ergo sum - "I code, therefore I am" --------------
Carsten Haitzler - ras...@rasterman.com


------------------------------------------------------------------------------
Check out the vibrant tech community on one of the world's most
engaging tech sites, Slashdot.org! http://sdm.link/slashdot
_______________________________________________
enlightenment-devel mailing list
enlightenment-devel@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/enlightenment-devel

Reply via email to