update Bags

2/3/4/5/6/7/ElvUI/Modules/Bags/BagBar.lua

@@ -17,19 +17,19 @@ ElvUIKeyRing:RegisterForClicks("anyUp")
 E:StripTextures(ElvUIKeyRing)
 ElvUIKeyRing:SetScript("OnClick", function() if CursorHasItem() then PutKeyInKeyRing() else ToggleKeyRing() end end)
 ElvUIKeyRing:SetScript("OnReceiveDrag", function() if CursorHasItem() then PutKeyInKeyRing() end end)
-ElvUIKeyRing:SetScript("OnEnter", function(self) GameTooltip:SetOwner(self, "ANCHOR_LEFT") local color = HIGHLIGHT_FONT_COLOR GameTooltip:SetText(KEYRING, color.r, color.g, color.b) GameTooltip:AddLine() end)
+ElvUIKeyRing:SetScript("OnEnter", function() GameTooltip:SetOwner(this, "ANCHOR_LEFT") local color = HIGHLIGHT_FONT_COLOR GameTooltip:SetText(KEYRING, color.r, color.g, color.b) GameTooltip:AddLine() end)
 ElvUIKeyRing:SetScript("OnLeave", function() GameTooltip:Hide() end)
 _G[ElvUIKeyRing:GetName().."IconTexture"]:SetTexture("Interface\\ContainerFrame\\KeyRing-Bag-Icon")
 _G[ElvUIKeyRing:GetName().."IconTexture"]:SetTexCoord(unpack(E.TexCoords))
 
 local function OnEnter()
 	if not E.db.bags.bagBar.mouseover then return end
-	E:UIFrameFadeOut(ElvUIBags, 0.2, ElvUIBags:GetAlpha(), 1)
+	UIFrameFadeIn(ElvUIBags, 0.2, ElvUIBags:GetAlpha(), 1)
 end
 
 local function OnLeave()
 	if not E.db.bags.bagBar.mouseover then return end
-	E:UIFrameFadeOut(ElvUIBags, 0.2, ElvUIBags:GetAlpha(), 0)
+	UIFrameFadeOut(ElvUIBags, 0.2, ElvUIBags:GetAlpha(), 0)
 end
 
 function B:SkinBag(bag)
@@ -41,6 +41,7 @@ function B:SkinBag(bag)
 	bag.backdrop:SetAllPoints()
 	E:StyleButton(bag, true)
 	icon:SetTexture(bag.oldTex)
+	icon:Show()
 	E:SetInside(icon)
 	icon:SetTexCoord(unpack(E.TexCoords))
 end
@@ -77,7 +78,13 @@ function B:SizeAndPositionBagBar()
 		button:SetWidth(E.db.bags.bagBar.size)
 		button:SetHeight(E.db.bags.bagBar.size)
 		button:ClearAllPoints()
-		button:Show()
+		-- if E.db.bags.bagBar.mouseover then
+		-- 	button:SetAlpha(0)
+		-- 	button:Show()
+		-- else
+		-- 	button:SetAlpha(1)
+		-- 	button:Show()
+		-- end
 
 		if growthDirection == "HORIZONTAL" and sortDirection == "ASCENDING" then
 			if i == 1 then
@@ -133,6 +140,8 @@ function B:LoadBagBar()
 	E:FontTemplate(MainMenuBarBackpackButtonCount, nil, 10)
 	MainMenuBarBackpackButtonCount:ClearAllPoints()
 	MainMenuBarBackpackButtonCount:SetPoint("BOTTOMRIGHT", MainMenuBarBackpackButton, "BOTTOMRIGHT", -1, 4)
+	MainMenuBarBackpackButton:Show()
+	MainMenuBarBackpackButton:SetAlpha(1)
 	HookScript(MainMenuBarBackpackButton, "OnEnter", OnEnter)
 	HookScript(MainMenuBarBackpackButton, "OnLeave", OnLeave)
 	tinsert(ElvUIBags.buttons, MainMenuBarBackpackButton)
@@ -142,8 +151,11 @@ function B:LoadBagBar()
 		local b = _G["CharacterBag"..i.."Slot"]
 		b:SetParent(ElvUIBags)
 		b.SetParent = E.dummy
-		b:HookScript("OnEnter", OnEnter)
+		b:Show()
-		b:HookScript("OnLeave", OnLeave)
+		b:SetAlpha(1)
+
+		HookScript(b, "OnEnter", OnEnter)
+		HookScript(b, "OnLeave", OnLeave)
 
 		self:SkinBag(b)
 		tinsert(ElvUIBags.buttons, b)

2/3/4/5/6/7/ElvUI/Modules/Bags/Bags.lua

@@ -992,15 +992,15 @@ function B:ContructContainerFrame(name, isBank)
 		E:SetTemplate(f.sortButton)
 		f.sortButton:SetPoint("RIGHT", f.goldText, "LEFT", -5, E.Border * 2)
 		f.sortButton:SetNormalTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage")
-		-- f.sortButton:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
+		f.sortButton:GetNormalTexture():SetTexCoord(unpack(E.TexCoords))
-		-- E:SetInside(f.sortButton:GetNormalTexture())
+		E:SetInside(f.sortButton:GetNormalTexture())
 		f.sortButton:SetPushedTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage")
-		-- f.sortButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords))
+		f.sortButton:GetPushedTexture():SetTexCoord(unpack(E.TexCoords))
-		-- E:SetInside(f.sortButton:GetPushedTexture())
+		E:SetInside(f.sortButton:GetPushedTexture())
 		f.sortButton:SetDisabledTexture("Interface\\AddOns\\ElvUI\\media\\textures\\INV_Pet_RatCage")
-		-- f.sortButton:GetDisabledTexture():SetTexCoord(unpack(E.TexCoords))
+		f.sortButton:GetDisabledTexture():SetTexCoord(unpack(E.TexCoords))
-		-- E:SetInside(f.sortButton:GetDisabledTexture())
+		E:SetInside(f.sortButton:GetDisabledTexture())
-		-- f.sortButton:GetDisabledTexture():SetDesaturated(true)
+		f.sortButton:GetDisabledTexture():SetDesaturated(true)
 		E:StyleButton(f.sortButton, nil, true)
 		f.sortButton.ttText = L["Sort Bags"]
 		f.sortButton:SetScript("OnEnter", self.Tooltip_Show)
@@ -1228,7 +1228,7 @@ function B:PostBagMove()
 end
 
 function B:Initialize()
-	-- self:LoadBagBar()
+	self:LoadBagBar()
 
 	local BagFrameHolder = CreateFrame("Frame", nil, E.UIParent)
 	BagFrameHolder:SetWidth(200)
@@ -1267,11 +1267,11 @@ function B:Initialize()
 	self.BagFrame = self:ContructContainerFrame("ElvUI_ContainerFrame")
 
 	--Hook onto Blizzard Functions
-	self:SecureHook("ToggleBackpack")
+	self:RawHook("ToggleBag", "ToggleBags")
-	self:SecureHook("ToggleBag", "ToggleBags")
+	self:RawHook("OpenBackpack", "OpenBags")
-	self:SecureHook("OpenBackpack", "OpenBags")
+	self:RawHook("CloseAllBags", "CloseBags")
-	self:SecureHook("CloseAllBags", "CloseBags")
+	self:RawHook("CloseBackpack", "CloseBags")
-	self:SecureHook("CloseBackpack", "CloseBags")
+	self:RawHook("ToggleBackpack", "ToggleBags")
 	self:RawHook("OpenAllBags", "OpenAllBags", true)
 
 	self:Layout()

2/3/4/5/6/7/ElvUI/Modules/Bags/Load_Bags.xml

@@ -1,3 +1,5 @@
 <Ui xmlns="http://www.blizzard.com/wow/ui/">
 	<Script file="Bags.lua"/>
+	<Script file="BagBar.lua"/>
+	<Script file="Sort.lua"/>
 </Ui>