Fix caption position calculation in GridLayout (#17619)

Change-Id: I5af773fbc03bc3d44e1aaa06ae974517583fdf4d

1 files changed, 9 insertions, 14 deletions

diff --git a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
index 5d463712df..f308d07673 100644
--- a/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
+++ b/client/src/com/vaadin/client/ui/layout/VLayoutSlot.java
@@ -126,7 +126,6 @@ public abstract class VLayoutSlot {
         }
 
         style.setLeft(Math.round(currentLocation), Unit.PX);
-        double padding = 0;
         AlignmentInfo alignment = getAlignment();
         if (!alignment.isLeft()) {
             double usedWidth;
@@ -135,21 +134,17 @@ public abstract class VLayoutSlot {
             } else {
                 usedWidth = getWidgetWidth();
             }
+
+            double padding = (allocatedSpace - usedWidth);
             if (alignment.isHorizontalCenter()) {
-                padding = (allocatedSpace - usedWidth) / 2d;
-                if (captionAboveCompnent) {
-                    captionStyle.setLeft(
-                            Math.round(usedWidth - captionWidth) / 2, Unit.PX);
-                }
-            } else {
-                padding = (allocatedSpace - usedWidth);
-                if (captionAboveCompnent) {
-                    captionStyle.setLeft(Math.round(usedWidth - captionWidth),
-                            Unit.PX);
-                }
+                padding = padding / 2;
+            }
+
+            long roundedPadding = Math.round(padding);
+            if (captionAboveCompnent) {
+                captionStyle.setLeft(roundedPadding, Unit.PX);
             }
-            widget.getElement().getStyle()
-                    .setLeft(Math.round(padding), Unit.PX);
+            widget.getElement().getStyle().setLeft(roundedPadding, Unit.PX);
         } else {
             if (captionAboveCompnent) {
                 captionStyle.setLeft(0, Unit.PX);