Skip to content
Snippets Groups Projects
Commit 2ebeec7a authored by buczekp's avatar buczekp
Browse files

[LMS-1320] fixed problem with text area height

SVN: 13978
parent c92031bc
No related branches found
No related tags found
No related merge requests found
...@@ -27,13 +27,12 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget. ...@@ -27,13 +27,12 @@ import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.widget.
*/ */
public class MultilineVarcharField extends TextArea public class MultilineVarcharField extends TextArea
{ {
private static final double DEFAULT_LINE_HEIGHT = 1.6; // in em
private static final double DEFAULT_LINE_HEIGHT = 1.6; private static final int EM_TO_PIXEL = 10;
private static final int DEFAULT_LINES = 5; private static final int DEFAULT_LINES = 5;
private static final int EM_TO_PIXEL = 16;
/** Constructor for default sized field (5 lines). */ /** Constructor for default sized field (5 lines). */
public MultilineVarcharField(final String label, final boolean mandatory) public MultilineVarcharField(final String label, final boolean mandatory)
{ {
...@@ -47,11 +46,10 @@ public class MultilineVarcharField extends TextArea ...@@ -47,11 +46,10 @@ public class MultilineVarcharField extends TextArea
this.setValidateOnBlur(true); this.setValidateOnBlur(true);
this.setAutoValidate(true); this.setAutoValidate(true);
FieldUtil.setMandatoryFlag(this, mandatory); FieldUtil.setMandatoryFlag(this, mandatory);
setHeightInLines(lines);
this.setHeightInLines(lines);
} }
public void setHeightInLines(int lines) private void setHeightInLines(int lines)
{ {
// WORKAROUND: GXT does not correctly interpret heights set in em's. Switch to pixels. // WORKAROUND: GXT does not correctly interpret heights set in em's. Switch to pixels.
// setHeight(lines * DEFAULT_LINE_HEIGHT + "em"); // setHeight(lines * DEFAULT_LINE_HEIGHT + "em");
......
...@@ -18,10 +18,9 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.ex ...@@ -18,10 +18,9 @@ package ch.systemsx.cisd.openbis.plugin.generic.client.web.client.application.ex
import java.util.List; import java.util.List;
import com.extjs.gxt.ui.client.widget.form.TextArea;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict; import ch.systemsx.cisd.openbis.generic.client.web.client.application.Dict;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants; import ch.systemsx.cisd.openbis.generic.client.web.client.application.GenericConstants;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.ui.field.MultilineVarcharField;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.IMessageProvider;
import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.StringUtils; import ch.systemsx.cisd.openbis.generic.client.web.client.application.util.StringUtils;
import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
...@@ -32,15 +31,14 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample; ...@@ -32,15 +31,14 @@ import ch.systemsx.cisd.openbis.generic.shared.basic.dto.Sample;
* *
* @author Tomasz Pylak * @author Tomasz Pylak
*/ */
final class ExperimentSamplesArea extends TextArea final class ExperimentSamplesArea extends MultilineVarcharField
{ {
public static final String ID_SUFFIX_SAMPLES = "_samples"; public static final String ID_SUFFIX_SAMPLES = "_samples";
public ExperimentSamplesArea(IMessageProvider messageProvider, String idPrefix) public ExperimentSamplesArea(IMessageProvider messageProvider, String idPrefix)
{ {
super(); super("", false);
setHeight("10em");
setLabelSeparator(""); setLabelSeparator("");
setEmptyText(messageProvider.getMessage(Dict.SAMPLES_LIST)); setEmptyText(messageProvider.getMessage(Dict.SAMPLES_LIST));
setId(createId(idPrefix)); setId(createId(idPrefix));
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment