Skip to content

Commit

Permalink
Preliminary 10.0 update
Browse files Browse the repository at this point in the history
  • Loading branch information
AcidWeb committed Oct 26, 2022
1 parent df20f4c commit 4eb9c27
Show file tree
Hide file tree
Showing 3 changed files with 26 additions and 29 deletions.
14 changes: 7 additions & 7 deletions REPorter.lua
Original file line number Diff line number Diff line change
Expand Up @@ -22,12 +22,12 @@ local GetMapArtLayerTextures = _G.C_Map.GetMapArtLayerTextures
local GetBestMapForUnit = _G.C_Map.GetBestMapForUnit
local GetAreaPOIForMap = _G.C_AreaPoiInfo.GetAreaPOIForMap
local GetAreaPOIInfo = _G.C_AreaPoiInfo.GetAreaPOIInfo
local GetPOITextureCoords = _G.GetPOITextureCoords
local GetPOITextureCoords = _G.C_Minimap.GetPOITextureCoords
local GetVignettes = _G.C_VignetteInfo.GetVignettes
local GetVignetteInfo = _G.C_VignetteInfo.GetVignetteInfo
local GetVignettePosition = _G.C_VignetteInfo.GetVignettePosition
local GetNumBattlefieldFlagPositions = _G.GetNumBattlefieldFlagPositions
local GetBattlefieldFlagPosition = _G.GetBattlefieldFlagPosition
local GetBattlefieldFlagPosition = _G.C_PvP.GetBattlefieldFlagPosition
local GetNumBattlefieldVehicles = _G.GetNumBattlefieldVehicles
local GetBattlefieldVehicleInfo = _G.C_PvP.GetBattlefieldVehicleInfo
local GetSubZoneText = _G.GetSubZoneText
Expand Down Expand Up @@ -114,7 +114,7 @@ RE.BlinkPOIValue = 0.3
RE.BlinkPOIUp = true

RE.FoundNewVersion = false
RE.AddonVersionCheck = 289
RE.AddonVersionCheck = 290
RE.ScreenHeight, RE.ScreenWidth = _G.UIParent:GetCenter()

RE.MapSettings = {
Expand Down Expand Up @@ -606,7 +606,7 @@ function RE:OnMouseWheel(delta)
end
newscale = RE:Round(newscale, 2)
_G.REPorterFrameCore:SetScale(newscale)
if _G.InterfaceOptionsFrame:IsShown() then
if _G.SettingsPanel:IsShown() then
RE.ConfigFrame.obj.children[1].children[1].children[8]:SetValue(newscale)
end
end
Expand All @@ -622,7 +622,7 @@ function RE:OnEvent(self, event, ...)

_G.LibStub("AceConfigRegistry-3.0"):RegisterOptionsTable("REPorter", RE.AceConfig)
RE.ConfigFrame = _G.LibStub("AceConfigDialog-3.0"):AddToBlizOptions("REPorter", "REPorter")
_G.InterfaceOptionsFrame:HookScript("OnHide", function() RE:HideDummyMap(true) end)
_G.SettingsPanel:HookScript("OnHide", function() RE:HideDummyMap(true) end)
RE:UpdateConfig()

RegisterAddonMessagePrefix("REPorter")
Expand Down Expand Up @@ -1656,7 +1656,7 @@ function RE:ShowDummyMap(mapID)
RE:LoadMapSettings()
RE:SetupReportBar()
_G.REPorterFrame:Show()
_G.InterfaceOptionsFrame:SetFrameStrata("LOW")
_G.SettingsPanel:SetFrameStrata("LOW")
end

function RE:HideDummyMap(save)
Expand All @@ -1666,7 +1666,7 @@ function RE:HideDummyMap(save)
RE.LastMap = 0
_G.REPorterFrame:Hide()
_G.REPorterBar:Hide()
_G.InterfaceOptionsFrame:SetFrameStrata("HIGH")
_G.SettingsPanel:SetFrameStrata("HIGH")
end
end
--
4 changes: 2 additions & 2 deletions REPorter.toc
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
## Interface: 90207
## Interface: 100000
## Title: |cFF74D06CRE|rPorter
## Notes: Provide battleground map.
## Version: 2.8.9
## Version: 2.9.0
## Author: AcidWeb
## SavedVariables: REPorterSettings
## X-WoWI-ID: 21089
Expand Down
37 changes: 17 additions & 20 deletions TaintLess.xml
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
<Ui><Script><![CDATA[--[[
TaintLess [20-10-19]
TaintLess [22-09-15]
https://www.townlong-yak.com/addons/taintless
All rights reserved.
Expand All @@ -19,14 +19,11 @@ local function purgeKey(t, k)
until issecurevariable(t, k)
end
-- https://www.townlong-yak.com/bugs/Mx7CWN-RefreshOverread
-- https://www.townlong-yak.com/addons/taintless/fixes/RefreshOverread
if (tonumber(UIDD_REFRESH_OVERREAD_PATCH_VERSION) or 0) < 3 then
UIDD_REFRESH_OVERREAD_PATCH_VERSION = 3
hooksecurefunc("UIDropDownMenu_InitializeHelper", function()
if UIDD_REFRESH_OVERREAD_PATCH_VERSION ~= 3 then
return
end
for i=1, UIDROPDOWNMENU_MAXLEVELS do
for i=1, UIDD_REFRESH_OVERREAD_PATCH_VERSION == 3 and UIDROPDOWNMENU_MAXLEVELS or 0 do
for j=1+_G["DropDownList" .. i].numButtons, UIDROPDOWNMENU_MAXBUTTONS do
local b, _ = _G["DropDownList" .. i .. "Button" .. j]
_ = issecurevariable(b, "checked") or purgeKey(b, "checked")
Expand All @@ -36,28 +33,28 @@ if (tonumber(UIDD_REFRESH_OVERREAD_PATCH_VERSION) or 0) < 3 then
end)
end
-- https://www.townlong-yak.com/bugs/Kjq4hm-DisplayModeTaint
-- https://www.townlong-yak.com/addons/taintless/fixes/DisplayModeTaint
if (tonumber(UIDROPDOWNMENU_OPEN_PATCH_VERSION) or 0) < 1 then
UIDROPDOWNMENU_OPEN_PATCH_VERSION = 1
hooksecurefunc("UIDropDownMenu_InitializeHelper", function(frame)
if UIDROPDOWNMENU_OPEN_PATCH_VERSION ~= 1 then
return
end
if UIDROPDOWNMENU_OPEN_MENU and UIDROPDOWNMENU_OPEN_MENU ~= frame
if UIDROPDOWNMENU_OPEN_PATCH_VERSION == 1
and UIDROPDOWNMENU_OPEN_MENU and UIDROPDOWNMENU_OPEN_MENU ~= frame
and not issecurevariable(UIDROPDOWNMENU_OPEN_MENU, "displayMode") then
purgeKey(_G, "UIDROPDOWNMENU_OPEN_MENU")
purgeKey(_G, "UIDROPDOWNMENU_OPEN_MENU")
end
end)
end
-- https://www.townlong-yak.com/bugs/gXwH4P-IOFrameSelection
if (tonumber(IOFRAME_SELECTION_PATCH_VERSION) or 0) < 1 then
IOFRAME_SELECTION_PATCH_VERSION = 1
InterfaceOptionsFrame:HookScript("OnHide", function()
if IOFRAME_SELECTION_PATCH_VERSION == 1 then
InterfaceOptionsFrameCategories.selection = nil
end
end)
-- https://www.townlong-yak.com/addons/taintless/fixes/IOFrameSelection
if (tonumber(IOFRAME_SELECTION_PATCH_VERSION) or 0) < 3 then
IOFRAME_SELECTION_PATCH_VERSION = 3
if InterfaceOptionsFrame then
InterfaceOptionsFrame:HookScript("OnHide", function()
if IOFRAME_SELECTION_PATCH_VERSION == 3 then
InterfaceOptionsFrameCategories.selection = nil
end
end)
end
end
]]></Script></Ui>

0 comments on commit 4eb9c27

Please sign in to comment.