Merge pull request #7296 from bwmilby/bwm-22624-tree-scroll-click

livecodepanos · web-flow · commit 29a93bd38f41 · 2020-04-24T19:14:30.000+03:00
[Bug 22624] Tree View Widget sends click when scrolling
diff --git a/extensions/widgets/treeview/notes/22624.md b/extensions/widgets/treeview/notes/22624.md
@@ -0,0 +1 @@
+# [22624] Do not register click when scrolling (mobileScroller)
diff --git a/extensions/widgets/treeview/treeview.lcb b/extensions/widgets/treeview/treeview.lcb
@@ -689,6 +689,7 @@ private variable mIndentPixels as Integer
 private variable mHoverRow as Integer
 private variable mHoverIcon as String
 private variable mMouseDownRow as Integer
+private variable mScrolledSinceMouseDown as Boolean
 
 private variable mFrameBorder as Boolean
 private variable mShowHover as Boolean
@@ -1156,6 +1157,7 @@ public handler OnMouseDown() returns nothing
 	else
 		put yPosToRowNumber(the y of the mouse position) into mMouseDownRow
 	end if
+	put false into mScrolledSinceMouseDown
 end handler
 
 public handler OnMouseMove() returns nothing
@@ -1271,6 +1273,11 @@ public handler OnClick() returns nothing
 		return
 	end if
 
+	// Just return if top position has changed (view was scrolled)
+	if mScrolledSinceMouseDown then
+		return
+	end if
+	
 	// If the first row was clicked then add a new element
 	if mHoverRow is 1 then
 		addBaseLevelElement()
@@ -2558,6 +2565,7 @@ end handler
 private handler setViewTopPosition(in pViewTopPosition as Real) returns nothing
 	if pViewTopPosition is not mViewTopPosition then
 		put pViewTopPosition into mViewTopPosition
+		put true into mScrolledSinceMouseDown
 		ensureViewTopPosition()
 		updateFirstDataItem()
 		updateScrollbar(mViewWidth, mViewHeight, mDataHeight, mViewTopPosition)

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [22624] Do not register click when scrolling (mobileScroller)`