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

Revert "Fix for bar layout+alternatives+uneven orientation"

Browse Source
This commit is contained in:
Meow
2026-03-30 18:53:48 +02:00
committed by GitHub
parent 474135ec15
commit 3ecc52e4cc
5 changed files with 25 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/actionbar.lua
+4 -25
View File
@@ -1276,26 +1276,6 @@ pfUI:RegisterModule("actionbar", "vanilla", function ()
local spacing = C.bars["bar"..i].spacing
local background = C.bars["bar"..i].background
local formfactor = C.bars["bar"..i].formfactor
local uneven = C.bars["bar"..i].uneven
local _, _, cols, rows = string.find(tostring(formfactor or ""), "(%d+)%s*x%s*(%d+)")
cols, rows = tonumber(cols), tonumber(rows)
local is_square = cols == 3 and rows == 3
local is_vertical = cols and cols <= 3 and not is_square
local is_horizontal = rows and rows <= 3 and not is_square
if is_vertical then
if uneven ~= "Up" and uneven ~= "Down" then
uneven = "Up"
end
elseif is_horizontal then
if uneven ~= "Left" and uneven ~= "Right" then
uneven = "Left"
end
elseif not uneven then
uneven = "Up"
end
C.bars["bar"..i].uneven = uneven
local autohide = C.bars["bar"..i].autohide
local hide_time = C.bars["bar"..i].hide_time
local hide_combat = C.bars["bar"..i].hide_combat == "1" and true or nil
@@ -1318,8 +1298,7 @@ pfUI:RegisterModule("actionbar", "vanilla", function ()
end
-- the stored layout is invalid, temporary fallback
local _, _, fcols, frows = string.find(tostring(formfactor or ""), "(%d+)%s*x%s*(%d+)")
if not ((fcols and frows) or pfGridmath[buttons][BarLayoutFormfactor(formfactor)]) then
if not pfGridmath[buttons][BarLayoutFormfactor(formfactor)] then
formfactor = BarLayoutOptions(buttons)[1]
end
@@ -1428,7 +1407,7 @@ pfUI:RegisterModule("actionbar", "vanilla", function ()
bars[i][j] = CreateActionButton(bars[i], i, j)
bars[i][j].bar = i
BarButtonAnchor(bars[i][j], buttonbasename, j, buttons, formfactor, size, border, spacing, uneven)
BarButtonAnchor(bars[i][j], buttonbasename, j, buttons, formfactor, size, border, spacing)
bars[i][j]:ClearAllPoints()
bars[i][j]:SetPoint(unpack(bars[i][j]._anchor))
bars[i][j]:Show()
@@ -1459,7 +1438,7 @@ pfUI:RegisterModule("actionbar", "vanilla", function ()
end
-- adjust actionbar size
BarLayoutSize(bars[i], buttons, formfactor, size, border, spacing, uneven)
BarLayoutSize(bars[i], buttons, formfactor, size, border, spacing)
bars[i]:SetWidth(bars[i]._size[1])
bars[i]:SetHeight(bars[i]._size[2])
bars[i]:ClearAllPoints()
@@ -1773,4 +1752,4 @@ pfUI:RegisterModule("actionbar", "vanilla", function ()
return reagent_counts[reagent_slots[slot]]
end
end
end)
end)
modules/gui.lua
+1 -17
View File
@@ -2609,21 +2609,6 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
local formfactors = function()
return BarLayoutOptions(tonumber(C.bars["bar"..id].buttons) or id < 11 and NUM_ACTIONBAR_BUTTONS or id > 11 and NUM_SHAPESHIFT_SLOTS or NUM_PET_ACTION_SLOTS)
end
local uneven_options = function()
local formfactor = tostring(C.bars["bar"..id].formfactor or "")
local _, _, cols, rows = string.find(formfactor, "(%d+)%s*x%s*(%d+)")
cols, rows = tonumber(cols), tonumber(rows)
if cols == 3 and rows == 3 then
return { "Up", "Down", "Left", "Right" }
elseif cols and cols <= 3 then
return { "Up", "Down" }
elseif rows and rows <= 3 then
return { "Left", "Right" }
end
return { "Up", "Down", "Left", "Right" }
end
CreateGUIEntry(T["Actionbar"], caption, function()
CreateConfig(U["bars"], T["Enable"], C.bars["bar"..id], "enable", "checkbox")
@@ -2642,7 +2627,6 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
CreateConfig(U["bars"], T["Icon Size"], C.bars["bar"..id], "icon_size")
CreateConfig(U["bars"], T["Spacing"], C.bars["bar"..id], "spacing", "dropdown", pfUI.gui.dropdowns.actionbarbuttons)
CreateConfig(U["bars"], T["Layout"], C.bars["bar"..id], "formfactor", "dropdown", formfactors)
CreateConfig(U["bars"], T["Layout Uneven Orientation"], C.bars["bar"..id], "uneven", "dropdown", uneven_options)
CreateConfig(U["bars"], T["Bar Background"], C.bars["bar"..id], "background", "checkbox")
CreateConfig(U["bars"], T["Show Hotkey Text"], C.bars["bar"..id], "showkeybind", "checkbox")
@@ -2994,4 +2978,4 @@ pfUI:RegisterModule("gui", "vanilla:tbc", function ()
end
end)
end
end)
end)