Merge pull request livecode#2808 from livecodeali/bugfix-15840

livecodeali · livecodeali · commit fa7d261aad03 · 2015-09-02T10:18:50.000+01:00
[[ Bug 15840 ]] Fix scrolling and display out-by-one irritations in tree view
diff --git a/extensions/widgets/treeview/notes/15840.md b/extensions/widgets/treeview/notes/15840.md
@@ -0,0 +1 @@
+# [15840] Last line of widget not visible in readOnly false mode
diff --git a/extensions/widgets/treeview/treeview.lcb b/extensions/widgets/treeview/treeview.lcb
@@ -682,7 +682,13 @@ public handler OnClick() returns nothing
 end handler
 
 private handler yPosToRowNumber(in pYPos as Number) returns Integer
-	return the floor of ((mViewTopPosition + pYPos) / mRowHeight + 1)
+    variable tRow as Number
+    put the floor of ((mViewTopPosition + pYPos) / mRowHeight + 1) into tRow
+    if mReadOnly then
+        add 1 to tRow
+    end if
+
+    return tRow
 end handler
 
 private handler xPosToIconString(in pXPos as Number) returns String
@@ -723,11 +729,7 @@ end handler
 // Clamp mViewTopPosition
 private handler ensureViewTopPosition()
 	variable tMinTop as Real
-	if mReadOnly then
-		put mRowHeight into tMinTop
-	else
-		put 0 into tMinTop
-	end if
+    put 0 into tMinTop
 
 	// Make sure we don't try to scroll above 0
 	if mViewTopPosition < tMinTop then 
@@ -745,15 +747,18 @@ private handler updateFirstDataItem()
 	put the floor of (mViewTopPosition / mRowHeight) + 1 into mFirstDataItem
 	if mFirstDataItem < 1 then
 		put 1 into mFirstDataItem
-	end if	
+	end if
+    if mReadOnly then
+        add 1 to mFirstDataItem
+    end if  
 end handler
 
 private handler updateParameters() returns nothing
 	put the number of elements in mDataList into mDataCount
 	if mReadOnly then
-		put mRowHeight * mDataCount into mDataHeight
-	else
 		put mRowHeight * (mDataCount - 1) into mDataHeight
+	else
+		put mRowHeight * mDataCount into mDataHeight
 	end if
 	put my height into mViewHeight
 	put my width into mViewWidth

Original file line number	Diff line number	Diff line change
`@@ -0,0 +1 @@`
	`1`	`+# [15840] Last line of widget not visible in readOnly false mode`