From: Marc Englund <marc.englund@itmill.com>
Date: Tue, 19 Aug 2008 11:26:22 +0000 (+0000)
Subject: Faulty if-clause caused ill-placed popup in some cases. Fixes #1886
X-Git-Tag: 6.7.0.beta1~4333
X-Git-Url: https://source.dussan.org/?a=commitdiff_plain;h=e48687017b2a24559adbea08a09199483cff4ff8;p=vaadin-framework.git

Faulty if-clause caused ill-placed popup in some cases. Fixes #1886

svn changeset:5214/svn branch:trunk
---

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
index 63af2f75d6..917aa1d288 100644
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IPopupCalendar.java
@@ -73,17 +73,18 @@ public class IPopupCalendar extends ITextualDate implements Paintable, Field,
                         l = Window.getClientWidth() + Window.getScrollLeft()
                                 - w;
                     }
-                    if (t + h > Window.getClientHeight()
+                    if (t + h + calendarToggle.getOffsetHeight() + 30 > Window
+                            .getClientHeight()
                             + Window.getScrollTop()) {
                         t = Window.getClientHeight() + Window.getScrollTop()
                                 - h - calendarToggle.getOffsetHeight() - 30;
                         l += calendarToggle.getOffsetWidth();
                     }
-                    
+
                     // fix size
                     popup.setWidth(w + "px");
                     popup.setHeight(h + "px");
-                    
+
                     popup.setPopupPosition(l, t
                             + calendarToggle.getOffsetHeight() + 2);