summaryrefslogtreecommitdiffstats
path: root/client
diff options
context:
space:
mode:
Diffstat (limited to 'client')
-rw-r--r--client/src/com/vaadin/client/ui/VGridLayout.java6
1 files changed, 4 insertions, 2 deletions
diff --git a/client/src/com/vaadin/client/ui/VGridLayout.java b/client/src/com/vaadin/client/ui/VGridLayout.java
index 4929b02c9a..90ae944322 100644
--- a/client/src/com/vaadin/client/ui/VGridLayout.java
+++ b/client/src/com/vaadin/client/ui/VGridLayout.java
@@ -360,7 +360,8 @@ public class VGridLayout extends ComplexPanel {
cell.layoutVertically(y, reservedMargin);
}
- if (rowHasComponentsOrRowSpan(row) || rowHeights[row] > 0) {
+ if (!hideEmptyRowsAndColumns || rowHasComponentsOrRowSpan(row)
+ || rowHeights[row] > 0) {
y += rowHeights[row] + verticalSpacing;
}
}
@@ -398,7 +399,8 @@ public class VGridLayout extends ComplexPanel {
cell.layoutHorizontally(x, reservedMargin);
}
}
- if (colHasComponentsOrColSpan(i) || columnWidths[i] > 0) {
+ if (!hideEmptyRowsAndColumns || colHasComponentsOrColSpan(i)
+ || columnWidths[i] > 0) {
x += columnWidths[i] + horizontalSpacing;
}
}