v3.5.1

r-e-d · Jul 18, 2018 · 5076de2 · 5076de2
1 parent 324f21e
commit 5076de2
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 45 deletions.
diff --git a/LeUI-SoD/LeUI-SoD.tp2 b/LeUI-SoD/LeUI-SoD.tp2
@@ -1,6 +1,6 @@
 BACKUP ~LeUI-SoD/backup~
 AUTHOR [email protected]~
-VERSION ~3.5~
+VERSION ~3.5.1~
 LANGUAGE
 	~English~ ~en_US~ ~LeUI-SoD/lang/en_US/setup.tra~
 

diff --git a/LeUI-SoD/copy/UI.menu b/LeUI-SoD/copy/UI.menu
@@ -22033,30 +22033,12 @@ function triggerChatboxScroll()
 end
 
 function chatboxScroll(top, height, contentHeight)
-	if(chatboxJumpToBottom and contentHeight > height) then
-		chatboxJumpToBottom = nil
-		return height-contentHeight
-	end
-	if(chatboxScrollToBottom == 0) then
-		--defer to default scrolling
-		return nil
-	end
-	if(contentHeight < height) then
-		--no scrolling required, content fits
+	if(chatboxScrollToBottom and contentHeight > height) then
 		chatboxScrollToBottom = nil
-		return nil
-	end
-	local dT = Infinity_GetClockTicks() - chatboxScrollTimeLast
-	chatboxScrollTimeLast = Infinity_GetClockTicks()
-	local newTop = (dT * -0.25) + top
-	if (newTop + contentHeight > height + 200) then
-		return (height - contentHeight + 200)
-	end
-	if(newTop + contentHeight < height) then
-		chatboxScrollToBottom = 0
-		return height - contentHeight
+		return height-contentHeight
 	end
-	return newTop
+	--defer to default
+	return nil
 end
 function displayOverflowResponses()
 	for k,v in pairs(dialogOverflowTable) do

diff --git a/LeUI-SoD/copy/UI_25.menu b/LeUI-SoD/copy/UI_25.menu
@@ -22062,30 +22062,12 @@ function triggerChatboxScroll()
 end
 
 function chatboxScroll(top, height, contentHeight)
-	if(chatboxJumpToBottom and contentHeight > height) then
-		chatboxJumpToBottom = nil
-		return height-contentHeight
-	end
-	if(chatboxScrollToBottom == 0) then
-		--defer to default scrolling
-		return nil
-	end
-	if(contentHeight < height) then
-		--no scrolling required, content fits
+	if(chatboxScrollToBottom and contentHeight > height) then
 		chatboxScrollToBottom = nil
-		return nil
-	end
-	local dT = Infinity_GetClockTicks() - chatboxScrollTimeLast
-	chatboxScrollTimeLast = Infinity_GetClockTicks()
-	local newTop = (dT * -0.25) + top
-	if (newTop + contentHeight > height + 200) then
-		return (height - contentHeight + 200)
-	end
-	if(newTop + contentHeight < height) then
-		chatboxScrollToBottom = 0
-		return height - contentHeight
+		return height-contentHeight
 	end
-	return newTop
+	--defer to default
+	return nil
 end
 function displayOverflowResponses()
 	for k,v in pairs(dialogOverflowTable) do