- measurement fixes

- sample1 rename
pykaso · Feb 7, 2013 · c2e888a · c2e888a
1 parent a28ca1f
commit c2e888a
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 31 deletions.
diff --git a/samples/sample1/ListView.gproj b/samples/sample1/ListView.gproj
diff --git a/samples/sample2/Sample2.gproj b/samples/sample2/Sample2.gproj
@@ -1,5 +1,5 @@
 <project>
- <properties autorotation="0" fps="60" scaleMode="0" mouseToTouch="1" iosDevice="0" packageName="com.yourdomain.yourapp" logicalHeight="480" logicalWidth="320" mouseTouchOrder="0" retinaDisplay="0" touchToMouse="1" assetsOnly="0" orientation="0" architecture="0">
+ <properties autorotation="0" fps="60" scaleMode="0" mouseToTouch="1" iosDevice="0" packageName="net.pykaso.gideros.listview.sample1" logicalHeight="480" logicalWidth="320" mouseTouchOrder="0" retinaDisplay="0" touchToMouse="1" assetsOnly="0" orientation="0" architecture="1">
   <imageScales/>
  </properties>
  <folder name="libs">

diff --git a/samples/sample2/main.lua b/samples/sample2/main.lua
@@ -10,6 +10,7 @@ data[4] = box(300, 480, 25, 0xffffff)
 myList = ListView.new({
 	width=480,
 	height=700,
+	friction = 0.97,
 	bgTexture = Texture.new("resources/images/texture.png"),
 	data=data
 })

diff --git a/ui/ListView.lua b/ui/ListView.lua
@@ -148,14 +148,14 @@ function ListView:listItemTouch(e, act)
 	elseif( self.isFocus ) then
 		if(act == "move") then
 			local lastItem = li:getChildAt(li:getNumChildren())
-			delta = (e.touch.y - prevPos)
+			delta = e.touch.y - prevPos
 			prevPos = e.touch.y
 
 			if (li:getChildAt(1).id == 1 and li:getY() > 0) or 
 			(lastItem.id == #self.itemData and (self.listHeight - lastItem:getY()-lastItem:getHeight()) <= 0) then
-				li:setY(li:getY() + delta/3)
+				li:setY(math.floor(li:getY() + delta/3))
 			else
-				li:setY(li:getY() + delta)
+				li:setY(math.floor(li:getY() + delta))
 			end
 			self:updateRender()     		
 		end
@@ -170,7 +170,7 @@ end
 
 function ListView:scrollList(event)
 
-	if math.abs(velocity) < 0.1 then
+	if math.abs(velocity) < 0.3 then
 		velocity = 0
 		self:removeEventListener("enterFrame", self.scrollList, self)