Browse Source

[merge from 6.7] #8639 Improved comments

svn changeset:23529/svn branch:6.8
tags/7.0.0.alpha2
Automerge 12 years ago
parent
commit
c5095d2981
1 changed files with 20 additions and 11 deletions
  1. 20
    11
      src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java

+ 20
- 11
src/com/vaadin/terminal/gwt/client/ui/VScrollTable.java View File

@@ -5229,23 +5229,32 @@ public class VScrollTable extends FlowPanel implements Table, ScrollHandler,
public void run() {
TouchScrollDelegate activeScrollDelegate = TouchScrollDelegate
.getActiveScrollDelegate();
/*
* If there's a scroll delegate, check if
* we're actually scrolling and handle it.
* If no delegate, do nothing here and let
* the row handle potential drag'n'drop or
* context menu.
*/
if (activeScrollDelegate != null) {
if (!activeScrollDelegate.isMoved()) {
if (activeScrollDelegate.isMoved()) {
/*
* scrolling hasn't started. Cancel
* scrolling and let row handle this
* as drag start or context menu.
* Prevent the row from handling
* touch move/end events (the
* delegate handles those) and from
* doing drag'n'drop or opening a
* context menu.
*/
activeScrollDelegate
.stopScrolling();
touchStart = null;
} else {
/*
* Scrolled or scrolling, clear
* touch start to indicate that row
* shouldn't handle touch move/end
* events.
* Scrolling hasn't started, so
* cancel delegate and let the row
* handle potential drag'n'drop or
* context menu.
*/
touchStart = null;
activeScrollDelegate
.stopScrolling();
}
}
}

Loading…
Cancel
Save