replace Ace3v with Ace3 ElvUI-TBC version

or easy tracking of code difference

ElvUI_Config/Libraries/AceGUI-3.0/widgets/AceGUIContainer-ScrollFrame.lua

@@ -2,14 +2,13 @@
 ScrollFrame Container
 Plain container that scrolls its content and doesn't grow in height.
 -------------------------------------------------------------------------------]]
-local Type, Version = "ScrollFrame", 24
+local Type, Version = "ScrollFrame", 23
 local AceGUI = LibStub and LibStub("AceGUI-3.0", true)
 if not AceGUI or (AceGUI:GetWidgetVersion(Type) or 0) >= Version then return end
 
 -- Lua APIs
 local pairs, assert, type = pairs, assert, type
 local min, max, floor, abs = math.min, math.max, math.floor, math.abs
-local format = string.format
 
 -- WoW APIs
 local CreateFrame, UIParent = CreateFrame, UIParent
@@ -17,24 +16,24 @@ local CreateFrame, UIParent = CreateFrame, UIParent
 --[[-----------------------------------------------------------------------------
 Support functions
 -------------------------------------------------------------------------------]]
-local function FixScrollOnUpdate()
-	this:SetScript("OnUpdate", nil)
-	this.obj:FixScroll()
+local function FixScrollOnUpdate(frame)
+	frame:SetScript("OnUpdate", nil)
+	frame.obj:FixScroll()
 end
 
 --[[-----------------------------------------------------------------------------
 Scripts
 -------------------------------------------------------------------------------]]
-local function ScrollFrame_OnMouseWheel()
-	this.obj:MoveScroll(arg1)
+local function ScrollFrame_OnMouseWheel(frame, value)
+	frame.obj:MoveScroll(value)
 end
 
-local function ScrollFrame_OnSizeChanged()
-	this:SetScript("OnUpdate", FixScrollOnUpdate)
+local function ScrollFrame_OnSizeChanged(frame)
+	frame:SetScript("OnUpdate", FixScrollOnUpdate)
 end
 
-local function ScrollBar_OnScrollValueChanged()
-	this.obj:SetScroll(arg1)
+local function ScrollBar_OnScrollValueChanged(frame, value)
+	frame.obj:SetScroll(value)
 end
 
 --[[-----------------------------------------------------------------------------
@@ -51,7 +50,7 @@ local methods = {
 		for k in pairs(self.localstatus) do
 			self.localstatus[k] = nil
 		end
-		self.scrollframe:SetPoint("BOTTOMRIGHT",0,0)
+		self.scrollframe:SetPoint("BOTTOMRIGHT")
 		self.scrollbar:Hide()
 		self.scrollBarShown = nil
 		self.content.height, self.content.width = nil, nil
@@ -90,46 +89,40 @@ local methods = {
 	end,
 
 	["FixScroll"] = function(self)
-
 		if self.updateLock then return end
 		self.updateLock = true
 		local status = self.status or self.localstatus
-		local scrollframe, content, scrollbar = self.scrollframe, self.content, self.scrollbar
-		local viewheight, height  = self.scrollframe:GetHeight(), self.content:GetHeight()
+		local height, viewheight = self.scrollframe:GetHeight(), self.content:GetHeight()
 		local offset = status.offset or 0
-		local curvalue = scrollbar:GetValue()
+		local curvalue = self.scrollbar:GetValue()
 		-- Give us a margin of error of 2 pixels to stop some conditions that i would blame on floating point inaccuracys
 		-- No-one is going to miss 2 pixels at the bottom of the frame, anyhow!
-
-		if height < viewheight + 2 then
+		if viewheight < height + 2 then
 			if self.scrollBarShown then
 				self.scrollBarShown = nil
-				scrollbar:Hide()
-				scrollbar:SetValue(0)
-				scrollframe:SetPoint("BOTTOMRIGHT",0,0)
+				self.scrollbar:Hide()
+				self.scrollbar:SetValue(0)
+				self.scrollframe:SetPoint("BOTTOMRIGHT")
 				self:DoLayout()
 			end
-			offset = 0
 		else
 			if not self.scrollBarShown then
 				self.scrollBarShown = true
-				scrollbar:Show()
-				scrollframe:SetPoint("BOTTOMRIGHT", -20, 0)
+				self.scrollbar:Show()
+				self.scrollframe:SetPoint("BOTTOMRIGHT", -20, 0)
 				self:DoLayout()
 			end
-			local value = (offset / (height - viewheight) * 1000)
-			if value > 1000 then
-				value = 1000
-				offset = height - viewheight
-			end
-			scrollbar:SetValue(value)
+			local value = (offset / (viewheight - height) * 1000)
+			if value > 1000 then value = 1000 end
+			self.scrollbar:SetValue(value)
 			self:SetScroll(value)
+			if value < 1000 then
+				self.content:ClearAllPoints()
+				self.content:SetPoint("TOPLEFT", 0, offset)
+				self.content:SetPoint("TOPRIGHT", 0, offset)
+				status.offset = offset
+			end
 		end
-		status.offset = offset
-		scrollframe:SetScrollChild(content)
-		content:ClearAllPoints()
-		content:SetPoint("TOPLEFT", 0, offset)
-		content:SetPoint("TOPRIGHT", 0, offset)
 		self.updateLock = nil
 	end,
 
@@ -148,7 +141,6 @@ local methods = {
 
 	["OnWidthSet"] = function(self, width)
 		local content = self.content
-		content:SetWidth(width)
 		content.width = width
 	end,
 
@@ -165,13 +157,13 @@ local function Constructor()
 	local num = AceGUI:GetNextWidgetNum(Type)
 
 	local scrollframe = CreateFrame("ScrollFrame", nil, frame)
-	scrollframe:SetPoint("TOPLEFT",0,0)
-	scrollframe:SetPoint("BOTTOMRIGHT",0,0)
+	scrollframe:SetPoint("TOPLEFT")
+	scrollframe:SetPoint("BOTTOMRIGHT")
 	scrollframe:EnableMouseWheel(true)
 	scrollframe:SetScript("OnMouseWheel", ScrollFrame_OnMouseWheel)
---	scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged)
+	scrollframe:SetScript("OnSizeChanged", ScrollFrame_OnSizeChanged)
 
-	local scrollbar = CreateFrame("Slider", format("AceConfigDialogScrollFrame%dScrollBar", num), scrollframe, "UIPanelScrollBarTemplate")
+	local scrollbar = CreateFrame("Slider", ("AceConfigDialogScrollFrame%dScrollBar"):format(num), scrollframe, "UIPanelScrollBarTemplate")
 	scrollbar:SetPoint("TOPLEFT", scrollframe, "TOPRIGHT", 4, -16)
 	scrollbar:SetPoint("BOTTOMLEFT", scrollframe, "BOTTOMRIGHT", 4, 16)
 	scrollbar:SetMinMaxValues(0, 1000)
@@ -188,8 +180,8 @@ local function Constructor()
 
 	--Container Support
 	local content = CreateFrame("Frame", nil, scrollframe)
-	content:SetPoint("TOPLEFT",0,0)
-	content:SetPoint("TOPRIGHT",0,0)
+	content:SetPoint("TOPLEFT")
+	content:SetPoint("TOPRIGHT")
 	content:SetHeight(400)
 	scrollframe:SetScrollChild(content)