From: Mathieu Baudier <mbaudier@argeo.org>
Date: Thu, 11 Feb 2021 10:24:36 +0000 (+0100)
Subject: Make terms parts more configurable.
X-Git-Tag: argeo-suite-2.1.20~1^2~4
X-Git-Url: http://git.argeo.org/?p=gpl%2Fargeo-suite.git;a=commitdiff_plain;h=febd8cb03480d12167dbe64983e3ae1510e8ead2

Make terms parts more configurable.
---

diff --git a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java
index 408a0bf..1d9b6bc 100644
--- a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java
+++ b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/AbstractTermsPart.java
@@ -5,6 +5,7 @@ import javax.jcr.Item;
 import org.argeo.cms.Localized;
 import org.argeo.cms.ui.CmsTheme;
 import org.argeo.cms.ui.util.CmsIcon;
+import org.argeo.cms.ui.util.CmsUiUtils;
 import org.argeo.cms.ui.viewers.EditablePart;
 import org.argeo.cms.ui.widgets.ContextOverlay;
 import org.argeo.cms.ui.widgets.StyledControl;
@@ -15,6 +16,7 @@ import org.eclipse.swt.SWT;
 import org.eclipse.swt.graphics.Color;
 import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.widgets.Composite;
+import org.eclipse.swt.widgets.Control;
 import org.eclipse.swt.widgets.Label;
 import org.eclipse.swt.widgets.Text;
 import org.eclipse.swt.widgets.ToolItem;
@@ -75,6 +77,14 @@ public abstract class AbstractTermsPart extends StyledControl implements Editabl
 
 	}
 
+	protected void setControlLayoutData(Control control) {
+		control.setLayoutData(CmsUiUtils.fillAll());
+	}
+
+	protected void setContainerLayoutData(Composite composite) {
+		composite.setLayoutData(CmsUiUtils.fillAll());
+	}
+
 	//
 	// STYLING
 	//
diff --git a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
index 436cc17..1084f4c 100644
--- a/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
+++ b/core/org.argeo.entity.ui/src/org/argeo/entity/ui/forms/MultiTermsPart.java
@@ -41,7 +41,9 @@ public class MultiTermsPart extends AbstractTermsPart {
 	@Override
 	protected Control createControl(Composite box, String style) {
 		Composite placeholder = new Composite(box, SWT.NONE);
-		RowLayout rl = new RowLayout(SWT.HORIZONTAL);
+
+		boolean vertical = SWT.VERTICAL == (getStyle() & SWT.VERTICAL);
+		RowLayout rl = new RowLayout(vertical ? SWT.VERTICAL : SWT.HORIZONTAL);
 		rl.wrap = true;
 		placeholder.setLayout(rl);
 		List<Term> currentValue = getValue();