From: Patrick Plitzner
Date: Wed, 10 Aug 2016 15:50:17 +0000 (+0200)
Subject: fix #5305 Set max width of combo elements to 50px
X-Git-Tag: 4.3.0^2~82
X-Git-Url: https://dev.e-taxonomy.eu/gitweb/taxeditor.git/commitdiff_plain/224b66a301a16e878ee6a5ae71fe9084546530ba?hp=a83b0d46539b80bce0e026bcdabdbdba0f7f2057;ds=sidebyside
fix #5305 Set max width of combo elements to 50px
---
diff --git a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
index 33b37cb0b..e2da02ba3 100644
--- a/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
+++ b/eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/combo/TermComboElement.java
@@ -10,6 +10,7 @@ import java.util.Comparator;
import java.util.List;
import org.eclipse.jface.util.PropertyChangeEvent;
+import org.eclipse.jface.viewers.ComboViewer;
import org.eclipse.swt.SWT;
import org.eclipse.swt.events.DisposeEvent;
import org.eclipse.swt.events.DisposeListener;
@@ -19,6 +20,7 @@ import org.eclipse.swt.graphics.Color;
import org.eclipse.swt.widgets.Combo;
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Listener;
+import org.eclipse.ui.forms.widgets.TableWrapData;
import eu.etaxonomy.cdm.model.common.DefinedTermBase;
import eu.etaxonomy.cdm.model.common.TermType;
@@ -108,11 +110,15 @@ public class TermComboElement
}
// create combo
- combo = new Combo(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY );//FIXME: removed this parameter seems break windows version: | style
+ ComboViewer viewer = new ComboViewer(getLayoutComposite(), SWT.BORDER | SWT.READ_ONLY );
+ combo = viewer.getCombo();
addControl(combo);
- combo.setLayoutData(LayoutConstants.FILL_HORIZONTALLY());
+ TableWrapData fill_HORIZONTALLY = LayoutConstants.FILL_HORIZONTALLY();
+ combo.setLayoutData(fill_HORIZONTALLY);
+ fill_HORIZONTALLY.maxWidth = 50;
combo.setVisibleItemCount(DEFAULT_VISIBLE_ITEMS);
+
if(termType!=null){
//TODO try to remove generic T and avoid classes to be used
populateTerms((List) getTermManager().getPreferredTerms(termType));