mirror of
https://github.com/brues-code/pfUI.git
synced 2026-09-21 23:26:56 +00:00
Brues
31ff2773b3
Replace the previous RunNextFrame conflict check with per-addon EventUtil.ContinueOnAddOnLoaded calls in modules/macrotweak.lua so macrotweak is disabled as soon as known conflicting addons load. Simplify variable naming and ensure the disabled flag is set correctly. In skins/blizzard/macro.lua replace separate SetHeight/SetWidth calls with a single SetSize(150,22) for MacroEditButton to tidy UI sizing.
93 lines
3.6 KiB
Lua
93 lines
3.6 KiB
Lua
pfUI:RegisterSkin("Macro", function ()
|
|
local rawborder, border = GetBorderSize()
|
|
local bpad = rawborder > 1 and border - GetPerfectPixel() or GetPerfectPixel()
|
|
|
|
HookAddonOrVariable("Blizzard_MacroUI", function()
|
|
StripTextures(MacroFrame)
|
|
CreateBackdrop(MacroFrame, nil, nil, .75)
|
|
CreateBackdropShadow(MacroFrame)
|
|
|
|
MacroFrame.backdrop:SetPoint("TOPLEFT", 10, -10)
|
|
MacroFrame.backdrop:SetPoint("BOTTOMRIGHT", -32, 52)
|
|
MacroFrame:SetHitRectInsets(10,32,10,72)
|
|
EnableMovable(MacroFrame)
|
|
|
|
SkinCloseButton(MacroFrameCloseButton, MacroFrame.backdrop, -6, -6)
|
|
|
|
local MacroFrameHeaderText = GetNoNameObject(MacroFrame, "FontString", "BORDER", CREATE_MACROS)
|
|
MacroFrameHeaderText:ClearAllPoints()
|
|
MacroFrameHeaderText:SetPoint("TOP", MacroFrame.backdrop, "TOP", 0, -10)
|
|
|
|
SkinTab(MacroFrameTab1)
|
|
SkinTab(MacroFrameTab2)
|
|
MacroFrameTab2:ClearAllPoints()
|
|
MacroFrameTab2:SetPoint("LEFT", MacroFrameTab1, "RIGHT", border*2 + 1, 0)
|
|
|
|
for i=1, MAX_MACROS do
|
|
local button = _G["MacroButton"..i]
|
|
local icon = _G["MacroButton"..i..'Icon']
|
|
StripTextures(button)
|
|
SkinButton(button, nil, nil, nil, icon)
|
|
end
|
|
StripTextures(MacroFrameSelectedMacroButton)
|
|
SkinButton(MacroFrameSelectedMacroButton, nil, nil, nil, MacroFrameSelectedMacroButtonIcon, true)
|
|
MacroFrameSelectedMacroName:ClearAllPoints()
|
|
MacroFrameSelectedMacroName:SetPoint("TOPLEFT", MacroFrameSelectedMacroButton, "TOPRIGHT", 6, 3)
|
|
|
|
SkinButton(MacroEditButton)
|
|
SkinButton(MacroDeleteButton)
|
|
SkinButton(MacroExitButton)
|
|
SkinButton(MacroNewButton)
|
|
MacroDeleteButton:ClearAllPoints()
|
|
MacroDeleteButton:SetPoint("BOTTOMLEFT", MacroFrame, "BOTTOMLEFT", 17, 57)
|
|
MacroExitButton:ClearAllPoints()
|
|
MacroExitButton:SetPoint("BOTTOMRIGHT", MacroFrame, "BOTTOMRIGHT", -32, 57)
|
|
MacroNewButton:ClearAllPoints()
|
|
MacroNewButton:SetPoint("RIGHT", MacroExitButton, "LEFT", -2*bpad, 0)
|
|
|
|
MacroEditButton:SetSize(150, 22)
|
|
MacroEditButton:ClearAllPoints()
|
|
MacroEditButton:SetPoint("BOTTOMLEFT", MacroFrameSelectedMacroButton, "BOTTOMRIGHT", 6, -2)
|
|
|
|
MacroFrameEnterMacroText:ClearAllPoints()
|
|
MacroFrameEnterMacroText:SetPoint("BOTTOMLEFT", MacroFrameTextBackground, "TOPLEFT", 8, 2)
|
|
|
|
CreateBackdrop(MacroFrameTextBackground, nil, true)
|
|
MacroFrameTextBackground:ClearAllPoints()
|
|
MacroFrameTextBackground:SetPoint("TOPLEFT", MacroFrame, "TOPLEFT", 18, -300)
|
|
StripTextures(MacroFrameScrollFrame)
|
|
SkinScrollbar(MacroFrameScrollFrameScrollBar)
|
|
MacroFrameScrollFrame:ClearAllPoints()
|
|
MacroFrameScrollFrame:SetPoint("TOPLEFT", MacroFrameSelectedMacroBackground, "BOTTOMLEFT", 11, -13)
|
|
|
|
|
|
|
|
StripTextures(MacroPopupFrame)
|
|
CreateBackdrop(MacroPopupFrame, nil, nil, .75)
|
|
MacroPopupFrame:SetFrameStrata("DIALOG")
|
|
MacroPopupFrame:ClearAllPoints()
|
|
MacroPopupFrame:SetPoint("TOPLEFT", MacroFrame.backdrop, "TOPRIGHT", 2*border, 0)
|
|
|
|
StripTextures(MacroPopupScrollFrame)
|
|
SkinScrollbar(MacroPopupScrollFrameScrollBar)
|
|
|
|
MacroPopupEditBox:DisableDrawLayer("BACKGROUND")
|
|
CreateBackdrop(MacroPopupEditBox, nil, true)
|
|
MacroPopupEditBox:SetScript("OnEscapePressed", function()
|
|
MacroPopupFrame:Hide()
|
|
MacroFrame_Update()
|
|
end)
|
|
|
|
for i=1, NUM_MACRO_ICONS_SHOWN do
|
|
local button = _G["MacroPopupButton"..i]
|
|
local icon = _G["MacroPopupButton"..i..'Icon']
|
|
StripTextures(button)
|
|
SkinButton(button, nil, nil, nil, icon)
|
|
end
|
|
SkinButton(MacroPopupCancelButton)
|
|
SkinButton(MacroPopupOkayButton)
|
|
MacroPopupOkayButton:ClearAllPoints()
|
|
MacroPopupOkayButton:SetPoint("RIGHT", MacroPopupCancelButton, "LEFT", -2*bpad, 0)
|
|
end)
|
|
end)
|