mirror of
https://github.com/brues-code/pfUI.git
synced 2026-10-25 21:40:49 +00:00
Compare commits
3
Commits
7f5d18bc30
...
ecb28fb194
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
ecb28fb194 | ||
|
|
94268b1162 | ||
|
|
1c7c91fdf7 |
@@ -956,6 +956,7 @@ function pfUI:LoadConfig()
|
||||
pfUI:UpdateConfig("questlog", nil, "showQuestLevels", "0")
|
||||
|
||||
pfUI:UpdateConfig("character", "inventory", "durability", "1")
|
||||
pfUI:UpdateConfig("character", "inventory", "equipflyout", "0")
|
||||
pfUI:UpdateConfig("character", "reputation", "repRequired", "1")
|
||||
pfUI:UpdateConfig("thirdparty", nil, "chatbg", "1")
|
||||
pfUI:UpdateConfig("thirdparty", nil, "showmeter", "0")
|
||||
|
||||
+1
-1
@@ -402,7 +402,7 @@ function pfUI.uf:UpdateConfig()
|
||||
if tonumber(f.config.pheight) < 0 then f.power:Hide() end
|
||||
|
||||
pfUI.api.CreateBackdrop(f.power, default_border)
|
||||
f.power.bar:SetFrameLevel(f.power:GetFrameLevel() + 1)
|
||||
f.power.bar:SetFrameLevel(f.power.backdrop:GetFrameLevel() + 1)
|
||||
f.power.bar:SetStatusBarTexture(pfUI.media[f.config.pbartexture])
|
||||
f.power.bar:SetAllPoints(f.power)
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@ pfUI:RegisterModule("equipmentmanager", function()
|
||||
local pendingAction = nil -- "new" | "save" | "rename" — what the popups apply to
|
||||
local slotOverlays = {} -- [invSlotID] = ignored-overlay texture on the character slot
|
||||
local popoutButtons = {} -- popout arrow buttons; toggled with the EM frame
|
||||
local UpdatePopouts -- forward decl; assigned once popouts + flyout exist
|
||||
|
||||
-- Pending ignored-slot toggles per set: a slotID here means the
|
||||
-- effective state is flipped from what's persisted. Committed on
|
||||
@@ -76,7 +77,7 @@ pfUI:RegisterModule("equipmentmanager", function()
|
||||
else
|
||||
frame:SetPoint("TOPLEFT", CharacterFrame, "TOPRIGHT", 0, 0)
|
||||
end
|
||||
for _, b in ipairs(popoutButtons) do b:Show() end
|
||||
UpdatePopouts()
|
||||
end)
|
||||
CreateBackdrop(frame, nil, nil, .9)
|
||||
CreateBackdropShadow(frame)
|
||||
@@ -452,13 +453,13 @@ pfUI:RegisterModule("equipmentmanager", function()
|
||||
-- ============================================================
|
||||
|
||||
local flyout = CreateFrame("Frame", "pfEqMgrFlyout", UIParent)
|
||||
-- Everything tied to the EM sidecar closes with it: the popout arrows,
|
||||
-- the per-slot flyout, and the name/icon popup. (OnShow re-shows the
|
||||
-- popout arrows.)
|
||||
-- The name/icon popup is sidecar-only, so it closes with the sidecar.
|
||||
-- Popout arrows and the flyout are reconciled by UpdatePopouts: by
|
||||
-- default they follow the sidecar, but with the "Always Show Equipment
|
||||
-- Slot Flyouts" option they stay while the paperdoll is open.
|
||||
frame:SetScript("OnHide", function()
|
||||
for _, b in ipairs(popoutButtons) do b:Hide() end
|
||||
flyout:Hide()
|
||||
namePopup:Hide()
|
||||
UpdatePopouts()
|
||||
end)
|
||||
flyout:SetFrameStrata("DIALOG")
|
||||
flyout:Hide()
|
||||
@@ -750,6 +751,27 @@ pfUI:RegisterModule("equipmentmanager", function()
|
||||
end
|
||||
end
|
||||
|
||||
-- Popout arrows follow the EM sidecar by default. With the
|
||||
-- "Always Show Equipment Slot Flyouts" option they follow the paperdoll
|
||||
-- instead, so gear can be swapped without opening the equipment manager.
|
||||
local function PopoutsActive()
|
||||
if C.character.inventory.equipflyout == "1" then
|
||||
return PaperDollFrame:IsShown()
|
||||
end
|
||||
return frame:IsShown()
|
||||
end
|
||||
|
||||
function UpdatePopouts()
|
||||
local show = PopoutsActive()
|
||||
for _, b in ipairs(popoutButtons) do
|
||||
if show then b:Show() else b:Hide() end
|
||||
end
|
||||
if not show then flyout:Hide() end
|
||||
end
|
||||
|
||||
PaperDollFrame:HookScript("OnShow", UpdatePopouts)
|
||||
PaperDollFrame:HookScript("OnHide", UpdatePopouts)
|
||||
|
||||
-- ============================================================
|
||||
-- Refresh
|
||||
-- ============================================================
|
||||
|
||||
@@ -2412,6 +2412,7 @@ pfUI:RegisterModule("gui", function ()
|
||||
|
||||
CreateGUIEntry(T["Character"], T["Inventory"], function()
|
||||
CreateConfig(nil, T["Show Durability"], C.character.inventory, "durability", "checkbox")
|
||||
CreateConfig(nil, T["Always Show Equipment Slot Flyouts"], C.character.inventory, "equipflyout", "checkbox")
|
||||
end)
|
||||
|
||||
CreateGUIEntry(T["Character"], T["Reputation"], function()
|
||||
|
||||
@@ -425,7 +425,7 @@ pfUI:SetScript("OnEvent", function()
|
||||
pfUI.version.major, pfUI.version.minor, pfUI.version.fix = 0, 0, 0
|
||||
pfUI.version.string = "dev"
|
||||
else
|
||||
local major, minor, fix = pfUI.api.strsplit(".", raw)
|
||||
local major, minor, fix = pfUI.api.strsplit(".", string.gsub(raw, "^[vV]", ""))
|
||||
pfUI.version.major = tonumber(major) or 0
|
||||
pfUI.version.minor = tonumber(minor) or 0
|
||||
pfUI.version.fix = tonumber(fix) or 0
|
||||
|
||||
Reference in New Issue
Block a user