diff options
Diffstat (limited to 'client/src')
| -rw-r--r-- | client/src/com/vaadin/client/ui/grid/Escalator.java | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/client/src/com/vaadin/client/ui/grid/Escalator.java b/client/src/com/vaadin/client/ui/grid/Escalator.java index 3ef8dcda31..80cb56675a 100644 --- a/client/src/com/vaadin/client/ui/grid/Escalator.java +++ b/client/src/com/vaadin/client/ui/grid/Escalator.java @@ -442,7 +442,13 @@ public class Escalator extends Widget { * TODO: only prevent if not scrolled to end/bottom. Or no? UX team * needs to decide. */ - event.preventDefault(); + final boolean warrantedYScroll = deltaY != 0 + && escalator.verticalScrollbar.needsScrollbars(); + final boolean warrantedXScroll = deltaX != 0 + && escalator.horizontalScrollbar.needsScrollbars(); + if (warrantedYScroll || warrantedXScroll) { + event.preventDefault(); + } } } |