diff options
| author | Artur Signell <artur.signell@itmill.com> | 2010-12-30 13:10:45 +0000 |
|---|---|---|
| committer | Artur Signell <artur.signell@itmill.com> | 2010-12-30 13:10:45 +0000 |
| commit | 6905865f658b6ac81da458e30ed2936c48508c51 (patch) | |
| tree | 76ab3b08d208d6ccef918727d377d158cc0d313c | |
| parent | 0cad8f8684ac2b0533ea3737ff476c47053e0f04 (diff) | |
| download | vaadin-framework-6905865f658b6ac81da458e30ed2936c48508c51.tar.gz vaadin-framework-6905865f658b6ac81da458e30ed2936c48508c51.zip | |
#6166 Exception in IE7/IE8 when a narrow PopupDateField is rendered
svn changeset:16725/svn branch:6.5
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java | 7 |
1 files changed, 6 insertions, 1 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java index e4253c979f..4a0d6ff0f5 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java +++ b/src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java @@ -392,7 +392,12 @@ public class VTextualDate extends VDateField implements Paintable, Field, public void iLayout() { if (needLayout) { - text.setWidth((getOffsetWidth() - getFieldExtraWidth()) + "px"); + int textFieldWidth = getOffsetWidth() - getFieldExtraWidth(); + if (textFieldWidth < 0) { + // Field can never be smaller than 0 (causes exception in IE) + textFieldWidth = 0; + } + text.setWidth(textFieldWidth + "px"); } } |