brues/pfUI
1
1
Fork 0
mirror of https://github.com/brues-code/pfUI.git synced 2026-09-22 15:46:56 +00:00
Code Issues 1 Packages Projects Releases Wiki Activity

api: handle escaping within the function

Browse Source
This commit is contained in:
shagu
2019-04-21 15:02:14 +02:00
parent f205aaa864
commit ca2cf71d04
3 changed files with 10 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
api/api.lua
+7 -8
View File
@@ -960,11 +960,10 @@ end
-- 'layer' [string]
-- 'arg1' [string]
-- return object
-- NOTE: special symbols must be escaped by the SAME symbol!
-- e.g. symbol '\': '\\'
-- symbol '-': '--'
function pfUI.api.GetNoNameObject(frame, objtype, layer, arg1, arg2)
local arg1 = arg1 and gsub(arg1, "([%+%-%*%(%)%?%[%]%^])", "%%%1")
local arg2 = arg2 and gsub(arg2, "([%+%-%*%(%)%?%[%]%^])", "%%%1")
local objects
if objtype == "Texture" or objtype == "FontString" then
objects = {frame:GetRegions()}
@@ -980,25 +979,25 @@ function pfUI.api.GetNoNameObject(frame, objtype, layer, arg1, arg2)
if objtype == "Texture" and object.SetTexture and object:GetTexture() ~= "Interface\\BUTTONS\\WHITE8X8" then
if arg1 then
local texture = object:GetTexture()
if texture and not string.find(texture, arg1) then check = false end
if texture and not string.find(texture, arg1, 1) then check = false end
end
if check then return object end
elseif objtype == "FontString" and object.SetText then
if arg1 then
local text = object:GetText()
if text and not string.find(text, arg1) then check = false end
if text and not string.find(text, arg1, 1) then check = false end
end
if check then return object end
elseif objtype == "Button" and object.GetNormalTexture and object:GetNormalTexture() then
if arg1 then
local texture = object:GetNormalTexture():GetTexture()
if texture and not string.find(texture, arg1) then check = false end
if texture and not string.find(texture, arg1, 1) then check = false end
end
if arg2 then
local text = object:GetText()
if text and not string.find(text, arg2) then check = false end
if text and not string.find(text, arg2, 1) then check = false end
end
if check then return object end
skins/blizzard/mail.lua
+2 -2
View File
@@ -129,8 +129,8 @@ pfUI:RegisterSkin("Mailbox", function ()
button.icon:SetTexture(tex)
end
end
SkinButton(GetNoNameObject(InboxFrame, "Button", nil, "UI--Panel--Button--Up", OPENMAIL))
local button = GetNoNameObject(SendMailFrame, "Button", nil, "UI--Panel--Button--Up", SEND_LABEL) -- this is SendMailMailButton
SkinButton(GetNoNameObject(InboxFrame, "Button", nil, "UI-Panel-Button-Up", OPENMAIL))
local button = GetNoNameObject(SendMailFrame, "Button", nil, "UI-Panel-Button-Up", SEND_LABEL) -- this is SendMailMailButton
SkinButton(button) -- hack! only it happened to do it
button:ClearAllPoints()
button:SetPoint("RIGHT", SendMailCancelButton, "LEFT", -2*bpad, 0)
skins/blizzard/options-interface.lua
+1 -1
View File
@@ -18,7 +18,7 @@ pfUI:RegisterSkin("Options - Interface", function ()
UIOptionsFrame.backdrop:SetPoint("BOTTOMRIGHT", 0, 50)
UIOptionsFrame:SetHitRectInsets(0,0,0,50)
local close = GetNoNameObject(UIOptionsFrame, "Button", nil, "UI--Panel--MinimizeButton--Up")
local close = GetNoNameObject(UIOptionsFrame, "Button", nil, "UI-Panel-MinimizeButton-Up")
-- increase button layer
UIOptionsFrameTab1:SetFrameLevel(8)