Improve theming.

[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 436cc17b89457e9e99c62ccfd65fca6249873953..af8df82b0184f574e1f0a74dc81e88377020f65c 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
@@ -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();
@@ -53,7 +55,8 @@ public class MultiTermsPart extends AbstractTermsPart {
                                String display = getTermLabel(value);
                                lbl.setText(display);
                                CmsUiUtils.style(lbl, style == null ? FormStyle.propertyText.style() : style);
-                               if (editable)
+                               processTermListLabel(value, lbl);
+                               if (isEditable())
                                        lbl.addMouseListener((MouseDoubleClick) (e) -> {
                                                startEditing();
                                        });
@@ -77,7 +80,7 @@ public class MultiTermsPart extends AbstractTermsPart {
                                }
                        }
                else {// empty
-                       if (editable && !isEditing()) {
+                       if (isEditable() && !isEditing()) {
                                ToolBar toolBar = new ToolBar(placeholder, SWT.HORIZONTAL);
                                ToolItem addItem = new ToolItem(toolBar, SWT.FLAT);
                                styleAdd(addItem);
@@ -181,7 +184,7 @@ public class MultiTermsPart extends AbstractTermsPart {
                        terms: for (String str : curr) {
                                Term term = termsManager.getTerm(str);
                                if (term == null) {
-                                       log.warn("Ignoring term " + str + " as it was not found.");
+                                       log.warn("Ignoring term " + str + " for " + getNode() + ", as it was not found.");
                                        continue terms;
                                }
                                res.add(term);