diff options
| author | Henrik Paul <henrik@vaadin.com> | 2015-01-13 11:25:03 +0200 |
|---|---|---|
| committer | Vaadin Code Review <review@vaadin.com> | 2015-01-13 19:57:22 +0000 |
| commit | 2fd0f18ec8362a23bf48069c64270344782e8eea (patch) | |
| tree | 7f198bf53ba55b52382ecefe028ab9e7e01b5cbe /client | |
| parent | 603122ef7b866afd7f8353eead5922435b2658db (diff) | |
| download | vaadin-framework-2fd0f18ec8362a23bf48069c64270344782e8eea.tar.gz vaadin-framework-2fd0f18ec8362a23bf48069c64270344782e8eea.zip | |
Grid deco elements are now resized appropriately (#16187)
Change-Id: Ibd33a7258188bd2ce6c203df0bff6053742a3f63
Diffstat (limited to 'client')
| -rw-r--r-- | client/src/com/vaadin/client/widgets/Escalator.java | 7 |
1 files changed, 3 insertions, 4 deletions
diff --git a/client/src/com/vaadin/client/widgets/Escalator.java b/client/src/com/vaadin/client/widgets/Escalator.java index deaa9005c3..a4e3846196 100644 --- a/client/src/com/vaadin/client/widgets/Escalator.java +++ b/client/src/com/vaadin/client/widgets/Escalator.java @@ -64,7 +64,6 @@ import com.vaadin.client.widget.escalator.PositionFunction.AbsolutePosition; import com.vaadin.client.widget.escalator.PositionFunction.Translate3DPosition; import com.vaadin.client.widget.escalator.PositionFunction.TranslatePosition; import com.vaadin.client.widget.escalator.PositionFunction.WebkitTranslate3DPosition; -import com.vaadin.client.widget.escalator.Row; import com.vaadin.client.widget.escalator.RowContainer; import com.vaadin.client.widget.escalator.RowVisibilityChangeEvent; import com.vaadin.client.widget.escalator.RowVisibilityChangeHandler; @@ -2184,6 +2183,7 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker bodyElem.getStyle().setMarginTop(heightOfSection, Unit.PX); verticalScrollbar.getElement().getStyle() .setTop(heightOfSection, Unit.PX); + headerDeco.getStyle().setHeight(heightOfSection, Unit.PX); } @Override @@ -2225,6 +2225,8 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker vscrollHeight -= horizontalScrollbar.getScrollbarThickness(); } + footerDeco.getStyle().setHeight(footer.heightOfSection, Unit.PX); + verticalScrollbar.setOffsetSize(vscrollHeight); } } @@ -4730,9 +4732,6 @@ public class Escalator extends Widget implements RequiresResize, DeferredWorker body.recalculateSectionHeight(); footer.recalculateSectionHeight(); - headerDeco.getStyle().setHeight(header.heightOfSection, Unit.PX); - footerDeco.getStyle().setHeight(footer.heightOfSection, Unit.PX); - scroller.recalculateScrollbarsForVirtualViewport(); body.verifyEscalatorCount(); Profiler.leave("Escalator.recalculateElementSizes"); |