Do not justify multi terms part.

[gpl/argeo-suite.git] / core / org.argeo.entity.ui / src / org / argeo / entity / ui / forms / MultiTermsPart.java

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 711596f22433cf7cfa77ccad0a63babea42d0bb5..395e7ef8a87375cd7dc12093b4aa56949cb5f8f8 100644 (file)
--- 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
@@ -20,7 +20,9 @@ import org.argeo.jcr.Jcr;
 import org.eclipse.swt.SWT;
 import org.eclipse.swt.events.FocusEvent;
 import org.eclipse.swt.events.FocusListener;
+import org.eclipse.swt.layout.GridData;
 import org.eclipse.swt.layout.GridLayout;
+import org.eclipse.swt.layout.RowData;
 import org.eclipse.swt.layout.RowLayout;
 import org.eclipse.swt.widgets.Composite;
 import org.eclipse.swt.widgets.Control;
@@ -44,10 +46,11 @@ public class MultiTermsPart extends AbstractTermsPart {
 
                boolean vertical = SWT.VERTICAL == (getStyle() & SWT.VERTICAL);
                RowLayout rl = new RowLayout(vertical ? SWT.VERTICAL : SWT.HORIZONTAL);
-               rl.wrap = true;
+//             rl.wrap = true;
+//             rl.justify = true;
                placeholder.setLayout(rl);
                List<Term> currentValue = getValue();
-               if (currentValue != null && !currentValue.isEmpty())
+               if (currentValue != null && !currentValue.isEmpty()) {
                        for (Term value : currentValue) {
                                Composite block = new Composite(placeholder, SWT.NONE);
                                block.setLayout(CmsUiUtils.noSpaceGridLayout(3));
@@ -55,6 +58,7 @@ public class MultiTermsPart extends AbstractTermsPart {
                                String display = getTermLabel(value);
                                lbl.setText(display);
                                CmsUiUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
+                               processTermListLabel(value, lbl);
                                if (isEditable())
                                        lbl.addMouseListener((MouseDoubleClick) (e) -> {
                                                startEditing();
@@ -78,7 +82,7 @@ public class MultiTermsPart extends AbstractTermsPart {
 
                                }
                        }
-               else {// empty
+               } else {// empty
                        if (isEditable() && !isEditing()) {
                                ToolBar toolBar = new ToolBar(placeholder, SWT.HORIZONTAL);
                                ToolItem addItem = new ToolItem(toolBar, SWT.FLAT);