Merge pull request #22 from Zwixx/master

Fix Compatiblity with Dragonflight
Kiatra · Nov 28, 2022 · 7cd77a2 · 7cd77a2
2 parents 2a49590 + ca0810f
commit 7cd77a2
Show file tree

Hide file tree

Showing 3 changed files with 50 additions and 48 deletions.
diff --git a/Chocolate.lua b/Chocolate.lua
@@ -343,7 +343,7 @@ local function OnDragStart(frame)
 		Drag:Start(bar, frame.name, frame)
 		frame:StartMoving()
 		frame.isMoving = true
-		frame:highlight(1)
+		frame:highlight(1, 0, 0, 0)
 	end
 end
 

diff --git a/Core.lua b/Core.lua
@@ -583,7 +583,7 @@ local function createPointer()
 	pointer:SetFrameLevel(20)
 	pointer:SetWidth(15)
 
-	local arrow = pointer:CreateTexture(nil, "DIALOG")
+	local arrow = pointer:CreateTexture(nil, "BACKGROUND")
 	arrow:SetPoint("CENTER",pointer,"LEFT", 0, 0)
 	arrow:SetTexture("Interface\\AddOns\\ChocolateBar\\pics\\pointer")
 	return pointer

diff --git a/Jostle.lua b/Jostle.lua
@@ -109,11 +109,11 @@ end
 
 if not Jostle.hooks.PlayerFrame_SequenceFinished then
 	Jostle.hooks.PlayerFrame_SequenceFinished = true
-	hooksecurefunc("PlayerFrame_SequenceFinished", function()
-		if Jostle.PlayerFrame_SequenceFinished then
-			Jostle:PlayerFrame_SequenceFinished()
-		end
-	end)
+--	hooksecurefunc("PlayerFrame_SequenceFinished", function()
+--		if Jostle.PlayerFrame_SequenceFinished then
+--			Jostle:PlayerFrame_SequenceFinished()
+--		end
+--	end)
 end
 
 function Jostle:WorldMapFrame_Hide()
@@ -361,49 +361,51 @@ function Jostle:Refresh(...)
 						anchor = "BOTTOM" .. anchor
 						offset = bottomOffset / framescale
 					end
-					if frame == MinimapCluster and not MinimapBorderTop:IsShown() then
-						offset = offset + MinimapBorderTop:GetHeight() * 3/5
-					elseif frame == ConsolidatedBuffs and TicketStatusFrame:IsShown() then
-						offset = offset - TicketStatusFrame:GetHeight() * TicketStatusFrame:GetScale()
-					elseif frame == DEFAULT_CHAT_FRAME then
-						y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 32
-						if StanceBarFrame and (PetActionBarFrame:IsShown() or StanceBarFrame:IsShown()) then
-							offset = offset + StanceBarFrame:GetHeight() * StanceBarFrame:GetScale()
-						end
-						if MultiBarBottomLeft:IsShown() then
-							offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale() - 21
-						end
-					elseif frame == ChatFrame2 then
-						y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 32
-						if MultiBarBottomRight:IsShown() then
-							offset = offset + MultiBarBottomRight:GetHeight() * MultiBarBottomRight:GetScale() - 21
-						end
-					elseif frame == GroupLootFrame1 or frame == TutorialFrameParent or frame == FramerateLabel then
-						if MultiBarBottomLeft:IsShown() or MultiBarBottomRight:IsShown() then
-							offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale()
-						end
-					elseif frame == DurabilityFrame or frame == WatchFrame then
-						anchorFrame = MinimapCluster
-						x = 0
-						y = 0
-						offset = 0
-						if frame == WatchFrame and DurabilityFrame:IsShown() then
-							y = y - DurabilityFrame:GetHeight() * DurabilityFrame:GetScale()
-						end
-						if frame == DurabilityFrame then
-							x = -20
-						end
-						anchor = "TOPRIGHT"
-						anchorAlt = "BOTTOMRIGHT"
-						if MultiBarRight:IsShown() then
-							x = x - MultiBarRight:GetWidth() * MultiBarRight:GetScale()
-							if MultiBarLeft:IsShown() then
-								x = x - MultiBarLeft:GetWidth() * MultiBarLeft:GetScale()
+					if MinimapBorderTop ~= nil then
+						if frame == MinimapCluster and not MinimapBorderTop:IsShown() then
+							offset = offset + MinimapBorderTop:GetHeight() * 3/5
+						elseif frame == ConsolidatedBuffs and TicketStatusFrame:IsShown() then
+							offset = offset - TicketStatusFrame:GetHeight() * TicketStatusFrame:GetScale()
+						elseif frame == DEFAULT_CHAT_FRAME then
+							y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 32
+							if StanceBarFrame and (PetActionBarFrame:IsShown() or StanceBarFrame:IsShown()) then
+								offset = offset + StanceBarFrame:GetHeight() * StanceBarFrame:GetScale()
+							end
+							if MultiBarBottomLeft:IsShown() then
+								offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale() - 21
+							end
+						elseif frame == ChatFrame2 then
+							y = MainMenuBar:GetHeight() * MainMenuBar:GetScale() + 32
+							if MultiBarBottomRight:IsShown() then
+								offset = offset + MultiBarBottomRight:GetHeight() * MultiBarBottomRight:GetScale() - 21
+							end
+						elseif frame == GroupLootFrame1 or frame == TutorialFrameParent or frame == FramerateLabel then
+							if MultiBarBottomLeft:IsShown() or MultiBarBottomRight:IsShown() then
+								offset = offset + MultiBarBottomLeft:GetHeight() * MultiBarBottomLeft:GetScale()
+							end
+						elseif frame == DurabilityFrame or frame == WatchFrame then
+							anchorFrame = MinimapCluster
+							x = 0
+							y = 0
+							offset = 0
+							if frame == WatchFrame and DurabilityFrame:IsShown() then
+								y = y - DurabilityFrame:GetHeight() * DurabilityFrame:GetScale()
+							end
+							if frame == DurabilityFrame then
+								x = -20
+							end
+							anchor = "TOPRIGHT"
+							anchorAlt = "BOTTOMRIGHT"
+							if MultiBarRight:IsShown() then
+								x = x - MultiBarRight:GetWidth() * MultiBarRight:GetScale()
+								if MultiBarLeft:IsShown() then
+									x = x - MultiBarLeft:GetWidth() * MultiBarLeft:GetScale()
+								end
 							end
+						elseif frame == OrderHallCommandBar and OrderHallCommandBar:IsShown() then
+								anchorAlt = "TOPLEFT"
+								anchor = "TOPLEFT"
 						end
-					elseif frame == OrderHallCommandBar and OrderHallCommandBar:IsShown() then
-							anchorAlt = "TOPLEFT"
-							anchor = "TOPLEFT"
 					end
 					if frame == FramerateLabel then
 						anchorFrame = WorldFrame