diff options
| author | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:00:15 +0300 |
|---|---|---|
| committer | Johannes Dahlström <johannesd@vaadin.com> | 2012-06-11 14:00:15 +0300 |
| commit | 194fbfa014776e476c6c43cbc9f3344ab22f0d18 (patch) | |
| tree | 50035b49e85114842fe5fa1a686e72af6ba23736 /src | |
| parent | 1125dea80bfe02a736f746c44f3d86b8868ad944 (diff) | |
| parent | 716de2f65ea070ffc2335b07af6fa793b4a948f9 (diff) | |
| download | vaadin-framework-194fbfa014776e476c6c43cbc9f3344ab22f0d18.tar.gz vaadin-framework-194fbfa014776e476c6c43cbc9f3344ab22f0d18.zip | |
Merge commit '716de'
Diffstat (limited to 'src')
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java | 5 | ||||
| -rw-r--r-- | src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java | 3 |
2 files changed, 3 insertions, 5 deletions
diff --git a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java index 62697c4d98..ef1ea8521b 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java +++ b/src/com/vaadin/terminal/gwt/client/ui/FocusableScrollPanel.java @@ -34,8 +34,8 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements public FocusableScrollPanel() { // Prevent IE standard mode bug when a AbsolutePanel is contained. + TouchScrollDelegate.enableTouchScrolling(this, getElement()); Style style = getElement().getStyle(); - style.setOverflow(Overflow.AUTO); style.setProperty("zoom", "1"); style.setPosition(Position.RELATIVE); } @@ -153,7 +153,8 @@ public class FocusableScrollPanel extends SimpleFocusablePanel implements * the new vertical scroll position, in pixels */ public void setScrollPosition(int position) { - if (BrowserInfo.get().isAndroidWithBrokenScrollTop()) { + if (BrowserInfo.get().isAndroidWithBrokenScrollTop() + && BrowserInfo.get().requiresTouchScrollDelegate()) { ArrayList<com.google.gwt.dom.client.Element> elements = TouchScrollDelegate .getElements(getElement()); for (com.google.gwt.dom.client.Element el : elements) { diff --git a/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java b/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java index 6fee125ff0..aa93195cb9 100644 --- a/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java +++ b/src/com/vaadin/terminal/gwt/client/ui/window/VWindow.java @@ -160,9 +160,6 @@ public class VWindow extends VOverlay implements ShortcutActionHandlerOwner, contentPanel.addKeyDownHandler(this); contentPanel.addFocusHandler(this); contentPanel.addBlurHandler(this); - - TouchScrollDelegate.enableTouchScrolling(this, getContainerElement() - .getFirstChildElement()); } public void bringToFront() { |