Compare commits

...

2 Commits

Author SHA1 Message Date
Carsten Haitzler a38eedd36d themes - fix new error checks in edje_cc
where parts/states etc. dont exist.
2019-09-26 22:54:56 +02:00
Carsten Haitzler 33ff0d8d83 build - new meson git added in as a keyword, so avoid it
use input instead of in, and output instead of out to avoid the new
keyword and be consistent.
2019-09-26 22:52:59 +02:00
3 changed files with 35 additions and 12 deletions

View File

@ -22,16 +22,16 @@ edje_install_dir = join_paths(get_option('datadir'),
meson.project_name(), 'themes')
foreach to_compile: edje_to_compile
out = to_compile[0] + '.edj'
in = to_compile[0] + '.edc'
edj_targets += [custom_target(out,
output = to_compile[0] + '.edj'
input = to_compile[0] + '.edc'
edj_targets += [custom_target(output,
install:true,
install_dir: edje_install_dir,
depend_files: files(to_compile[1]),
command: command,
input: in,
output: out)]
edj_files += [join_paths(edje_install_dir, out)]
input: input,
output: output)]
edj_files += [join_paths(edje_install_dir, output)]
endforeach
subdir('nyanology')

View File

@ -1208,7 +1208,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@ -1223,7 +1222,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@ -1238,7 +1236,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";
@ -1253,7 +1250,6 @@ collections {
target: "popmedia_clip";
target: "popmedia_dismiss";
target: "popmedia_shadow";
target: "popmedia_fill";
target: "popmedia_overlay";
target: "popmedia_bevel";
target: "popmedia_glint";

View File

@ -95,6 +95,15 @@ collections {
description { state: "oneline" 0.0;
visible: 0;
}
description { state: "disjoint" 0.0;
inherit: "default" 0.0;
}
description { state: "topfull" 0.0;
inherit: "default" 0.0;
}
description { state: "bottomfull" 0.0;
inherit: "default" 0.0;
}
}
part { name: "middle_clip"; type: RECT;
mouse_events: 0;
@ -110,6 +119,15 @@ collections {
rel2.to: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
}
description { state: "disjoint" 0.0;
inherit: "default" 0.0;
}
description { state: "topfull" 0.0;
inherit: "default" 0.0;
}
description { state: "bottomfull" 0.0;
inherit: "default" 0.0;
}
}
part { name: "bottom_clip"; type: RECT;
mouse_events: 0;
@ -118,10 +136,19 @@ collections {
rel1.relative: 0.0 0.0;
rel2.to_x: "terminology.bottom_right";
rel2.relative: 0.0 1.0;
}
description { state: "oneline" 0.0;
}
description { state: "oneline" 0.0;
visible: 0;
}
description { state: "disjoint" 0.0;
inherit: "default" 0.0;
}
description { state: "topfull" 0.0;
inherit: "default" 0.0;
}
description { state: "bottomfull" 0.0;
inherit: "default" 0.0;
}
}
// the outline around the selection...