diff options
| author | Anna Koskinen <Ansku@users.noreply.github.com> | 2018-11-21 14:46:06 +0200 |
|---|---|---|
| committer | Olli Tietäväinen <ollit@vaadin.com> | 2018-11-21 14:46:06 +0200 |
| commit | 62847523b58b759a571b65303f18cf67bb497d92 (patch) | |
| tree | 3568bb9abd066f09df4c08a2f0064769cdf3c349 /client | |
| parent | 124ed6d87ecfdfbb1d88ffdf615f5c8cc7f0e0b1 (diff) | |
| download | vaadin-framework-62847523b58b759a571b65303f18cf67bb497d92.tar.gz vaadin-framework-62847523b58b759a571b65303f18cf67bb497d92.zip | |
Fix for setting default row height for a Grid with details row(s) open. (#11326)
* Fix for setting default row height for a Grid with details row(s) open.
- Details row(s) should be taken into account when the rows are
re-positioned after getting new heights.
Fixes #11325
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/main/java/com/vaadin/client/widgets/Escalator.java | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/client/src/main/java/com/vaadin/client/widgets/Escalator.java b/client/src/main/java/com/vaadin/client/widgets/Escalator.java index 393708f7da..598d789577 100644 --- a/client/src/main/java/com/vaadin/client/widgets/Escalator.java +++ b/client/src/main/java/com/vaadin/client/widgets/Escalator.java @@ -3925,13 +3925,22 @@ public class Escalator extends Widget Profiler.enter( "Escalator.BodyRowContainer.reapplyDefaultRowHeights"); + double spacerHeights = 0; + /* step 1: resize and reposition rows */ for (int i = 0; i < visualRowOrder.size(); i++) { TableRowElement tr = visualRowOrder.get(i); reapplyRowHeight(tr, getDefaultRowHeight()); final int logicalIndex = getTopRowLogicalIndex() + i; - setRowPosition(tr, 0, logicalIndex * getDefaultRowHeight()); + setRowPosition(tr, 0, + logicalIndex * getDefaultRowHeight() + spacerHeights); + + com.vaadin.client.widgets.Escalator.SpacerContainer.SpacerImpl spacer = body.spacerContainer + .getSpacer(i); + if (spacer != null && spacer.getHeight() > 0) { + spacerHeights += spacer.getHeight(); + } } /* |