diff options
| author | Artur Signell <artur@vaadin.com> | 2014-08-29 17:33:11 +0300 |
|---|---|---|
| committer | Leif Åstrand <leif@vaadin.com> | 2014-08-30 12:02:45 +0300 |
| commit | 80012056f44fe6b3e7eb01957f3effb872e47780 (patch) | |
| tree | 19ca92cc92e734820ba09d3dd54211080a8e9633 /client | |
| parent | 88f9abab7e530ebe46f7384690d770f0021fe3d5 (diff) | |
| download | vaadin-framework-80012056f44fe6b3e7eb01957f3effb872e47780.tar.gz vaadin-framework-80012056f44fe6b3e7eb01957f3effb872e47780.zip | |
Fix GridLayout layout issue with empty rows above a component (#14554)
* Issue introduced in 8476b57ce2261313f47b21764ddc02cc128b2fd4
Change-Id: Ie84489aac4553e70e7e80561aec748a874a85653
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/ui/VGridLayout.java | 6 |
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; } } |