| commit | 9c2bc8fa5527955632a94c431da3f3a8d50919b6 | [log] [tgz] |
|---|---|---|
| author | Christoph Schwank <christoph.schwank@bsiag.com> | Thu Aug 07 10:42:44 2014 +0200 |
| committer | Beat Schwarzentrub <bsh@bsiag.com> | Thu Aug 07 04:50:40 2014 -0400 |
| tree | 04305427eb4b0f147dc0a895e271f68565ca1f95 | |
| parent | 6c495151429845f9e8bdc77f417790147c7bbb8d [diff] |
cherry pick from 4.0.x: ASSIGNED - bug 414757: AbstractFormField.setLabel() sets the label on the left hand side regardless the position LABEL_POSITION_ON_FIELD https://bugs.eclipse.org/bugs/show_bug.cgi?id=414757 Change-Id: I6d0b30c81b938cb2c53fe31726092a7735230901 Reviewed-on: https://git.eclipse.org/r/30948 Tested-by: Hudson CI Reviewed-by: Beat Schwarzentrub <bsh@bsiag.com> Reviewed-on: https://git.eclipse.org/r/31165
diff --git a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/SwingScoutFieldComposite.java b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/SwingScoutFieldComposite.java index eb1cfaf..80043ac 100644 --- a/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/SwingScoutFieldComposite.java +++ b/org.eclipse.scout.rt.ui.swing/src/org/eclipse/scout/rt/ui/swing/form/fields/SwingScoutFieldComposite.java
@@ -230,7 +230,12 @@ protected void setLabelFromScout(String s) { if (m_swingStatusLabel != null) { - m_swingStatusLabel.setText(s); + if (getScoutObject().getLabelPosition() == IFormField.LABEL_POSITION_ON_FIELD) { + m_swingStatusLabel.setText(null); + } + else { + m_swingStatusLabel.setText(s); + } if (m_swingContainer != null && m_swingStatusLabel.isVisible()) { m_swingContainer.revalidate(); }