Take border into account in Grid editor position when it opens upwards. (#12118)

diff --git a/client/src/main/java/com/vaadin/client/widgets/Grid.java b/client/src/main/java/com/vaadin/client/widgets/Grid.java
index ebf5c8ca960918664d916793385394fc1583569a..a47cc4bfcaf7616898283b0daeee0de130c8da8a 100755 (executable)
--- a/client/src/main/java/com/vaadin/client/widgets/Grid.java
+++ b/client/src/main/java/com/vaadin/client/widgets/Grid.java
@@ -2040,9 +2040,10 @@ public class Grid<T> extends ResizeComposite implements HasSelectionHandlers<T>,
                 // overlay from the bottom
                 editorOverlay.insertFirst(messageAndButtonsWrapper);
                 int gridHeight = grid.getElement().getOffsetHeight();
-                editorOverlay.getStyle().setBottom(
-                        gridHeight - overlayTop - tr.getOffsetHeight(),
-                        Unit.PX);
+                double borderHeight = WidgetUtil
+                        .getBorderBottomThickness(editorOverlay);
+                editorOverlay.getStyle().setBottom(gridHeight - overlayTop
+                        - tr.getOffsetHeight() + borderHeight, Unit.PX);
                 editorOverlay.getStyle().clearTop();
             }
 

diff --git a/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__noscroll.png b/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__noscroll.png
index cd676d0a144567be4b60d0199cd521949485f527..627d5640153220bc10d8cb6c4ef2e638f51975b5 100755 (executable)
Binary files a/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__noscroll.png and b/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__noscroll.png differ

diff --git a/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png b/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png
index fc3b459af2abcd86a12e03eaa888c124f0cc2e85..3470c6e0924c59716ed2bd687e11131fc0033eca 100755 (executable)
Binary files a/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png and b/uitest/reference-screenshots/chrome/GridEditorFrozenColumnsUITest-testEditorWithFrozenColumns_ANY_Chrome__scrolled.png differ