Add xalign and yalign to group

issue8956
review258581002
This commit is contained in:
Cédric Krier committed 2020-01-24 00:18:19 +01:00
1 parent 5922d68313
commit d39a1c2750
2 files changed
+18 -5

No files matched your search

+3
View File
@@ -380,6 +380,9 @@ img.icon {
.form {
width: 100%;
.form-container, .form-hcontainer, .form-vcontainer {
display: inline-table;
}
table.form-container > tbody > tr > td {
padding: 1px;
}
+15 -5
View File
@@ -164,6 +164,12 @@ function eval_pyson(value){
this.view.containers.push(group);
this.parse_child(node, group);
if (attributes.xalign === undefined) {
attributes.xalign = 0.5;
}
if (attributes.yalign === undefined) {
attributes.yalign = 0.5;
}
if (attributes.name && (attributes.name == this.exclude_field)) {
this.container.add(null, attributes);
return;
@@ -485,10 +491,14 @@ function eval_pyson(value){
if (attributes.xalign !== undefined) {
// TODO replace by start/end when supported
var align;
if (Sao.i18n.rtl) {
align = attributes.xalign >= 0.5? 'left': 'right';
} else {
align = attributes.xalign >= 0.5? 'right': 'left';
if (attributes.xalign != 0.5) {
if (Sao.i18n.rtl) {
align = attributes.xalign >= 0.5? 'left': 'right';
} else {
align = attributes.xalign >= 0.5? 'right': 'left';
}
} else if (!xexpand) {
align = 'center';
}
cell.css('text-align', align);
}
@@ -625,7 +635,7 @@ function eval_pyson(value){
i += colspan;
});
});
if (has_expand) {
if (has_expand && this.el.closest('td').hasClass('xexpand')) {
this.el.css('width', '100%');
} else {
this.el.css('width', '');