From 6905865f658b6ac81da458e30ed2936c48508c51 Mon Sep 17 00:00:00 2001 From: Artur Signell Date: Thu, 30 Dec 2010 13:10:45 +0000 Subject: [PATCH] #6166 Exception in IE7/IE8 when a narrow PopupDateField is rendered svn changeset:16725/svn branch:6.5 --- src/com/vaadin/terminal/gwt/client/ui/VTextualDate.java | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) 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"); } } -- 2.39.5