Fix for #2504 - IFilterSelect popup in wrong position

svn changeset:6748/svn branch:trunk

diff --git a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
index 89d5f482f38ad52464f293a572850097db69649d..c7d224c70ebf51f54f630c1782593b15bf295b27 100644 (file)
--- a/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
+++ b/src/com/itmill/toolkit/terminal/gwt/client/ui/IFilterSelect.java
@@ -103,6 +103,8 @@ public class IFilterSelect extends Composite implements Paintable, Field,
 
         private int popupOuterPadding = -1;
 
+        private int topPosition;
+
         SuggestionPopup() {
             super(true, false, true);
             menu = new SuggestionMenu();
@@ -136,9 +138,10 @@ public class IFilterSelect extends Composite implements Paintable, Field,
 
             menu.setSuggestions(currentSuggestions);
             final int x = IFilterSelect.this.getAbsoluteLeft();
-            int y = tb.getAbsoluteTop();
-            y += tb.getOffsetHeight();
-            setPopupPosition(x, y);
+            topPosition = tb.getAbsoluteTop();
+            topPosition += tb.getOffsetHeight();
+            setPopupPosition(x, topPosition);
+
             final int first = currentPage * PAGELENTH
                     + (nullSelectionAllowed && currentPage > 0 ? 0 : 1);
             final int last = first + currentSuggestions.size() - 1;
@@ -328,6 +331,13 @@ public class IFilterSelect extends Composite implements Paintable, Field,
                 }
             } else {
                 top = getPopupTop();
+                /*
+                 * Take popup top margin into account. getPopupTop() returns the
+                 * top value including the margin but the value we give must not
+                 * include the margin.
+                 */
+                int topMargin = (top - topPosition);
+                top -= topMargin;
             }
 
             // fetch real width (mac FF bugs here due GWT popups overflow:auto )