Skip to content

Fix issue empties #2

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ScottIngram wants to merge 3 commits into
base: master
Choose a base branch
from
Open

Fix issue empties #2

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
bd1abc7
Create README.md
ScottIngram Mar 18, 2023
856e0ce
fix for issue #1 - errors when empty flyouts exist on bars
ScottIngram Mar 19, 2023
b017a22
FIX for fix for issue #1 - oops, left in a debug clause
ScottIngram Mar 19, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
36 changes: 21 additions & 15 deletions FloFlyout.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,10 @@ local L = FLOFLYOUT_L10N_STRINGS
-- Functions
-------------------------------------------------------------------------------

function isEmpty(s)
return s == nil or s == ''
end

function FloFlyout.ReadCmd(line)
local cmd, arg1, arg2 = strsplit(' ', line or "", 3);

Expand Down Expand Up @@ -228,7 +232,7 @@ function FloFlyoutFrame_OnEvent(self, event, ...)
if event == "SPELL_UPDATE_COOLDOWN" then
local i = 1
local button = _G[self:GetName().."Button"..i]
while (button and button:IsShown() and button.spellID) do
while (button and button:IsShown() and not isEmpty(button.spellID)) do
SpellFlyoutButton_UpdateCooldown(button)
i = i+1
button = _G[self:GetName().."Button"..i]
Expand Down Expand Up @@ -437,11 +441,11 @@ local function Opener_PreClick(self, button, down)
local buttonList = { FloFlyoutFrame:GetChildren() }
table.remove(buttonList, 1)
for i, buttonRef in ipairs(buttonList) do
if spellList[i] then
buttonRef.spellID = spellList[i]
buttonRef.actionType = typeList[i]
local icon = FloFlyout:GetTexture(typeList[i], spellList[i])
_G[buttonRef:GetName().."Icon"]:SetTexture(icon)
buttonRef.spellID = spellList[i]
buttonRef.actionType = typeList[i]
local icon = FloFlyout:GetTexture(typeList[i], spellList[i])
_G[buttonRef:GetName().."Icon"]:SetTexture(icon)
if not isEmpty(spellList[i]) then
SpellFlyoutButton_UpdateCooldown(buttonRef)
SpellFlyoutButton_UpdateState(buttonRef)
SpellFlyoutButton_UpdateUsable(buttonRef)
Expand Down Expand Up @@ -588,15 +592,17 @@ function FloFlyout:CreateOpener(name, idFlyout, actionId, direction, actionButto
_classicUI.LayoutActionButton(opener, typeActionButton)
opener:SetScale(actionButton:GetScale())
end
if actionButton:GetSize() and actionButton:IsRectValid() then
opener:SetAllPoints(actionButton)
else
local spacerName = "ActionBarButtonSpacer"..tostring(actionButton.index)
local children = {actionButton:GetParent():GetChildren()}
for _, child in ipairs(children) do
if child:GetName() == spacerName then
opener:SetAllPoints(child)
break;
if actionButton then
if actionButton:GetSize() and actionButton:IsRectValid() then
opener:SetAllPoints(actionButton)
else
local spacerName = "ActionBarButtonSpacer"..tostring(actionButton.index)
local children = {actionButton:GetParent():GetChildren()}
for _, child in ipairs(children) do
if child:GetName() == spacerName then
opener:SetAllPoints(child)
break;
end
end
end
end
Expand Down
2 changes: 2 additions & 0 deletions README.md
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
# FloFlyout
wow addon to provide custom flyout menus - created by Boboseb