Skip to content
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

Fix an exception when change icon #6

Closed
wants to merge 3 commits into from
+19 −8
Closed

Fix an exception when change icon #6

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
bdffbff
Fix exception when change icon.
a08381 Oct 18, 2017
ca15294
format.
a08381 Oct 18, 2017
1d3673e
Fix Upgrade Button.
a08381 Oct 20, 2017
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
6 changes: 4 additions & 2 deletions SuperDuperMacro_Core.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -411,7 +411,9 @@ function sdm_UpgradeMacro(index) -- Upgrades the given standard macro to a Super
local body = GetMacroBody(index)
EditMacro(index, nil, nil, "#sdm"..sdm_numToChars(sdm_GetEmptySlot()).."\n#placeholder") -- let SDM know that this is the macro to edit
local _, texture = GetMacroInfo(index) -- This must be done AFTER the macro body is edited, or the question mark could show up as something else.
texture = texture:sub(17) -- remove the "INTERFACE\\ICONS\\"
if type(texture) ~= "number" then
texture = texture:sub(17) -- remove the "INTERFACE\\ICONS\\"
end
local newMacro = sdm_CreateNew("b", name, character)
newMacro.icon = texture
sdm_Edit(newMacro, body)
Expand Down Expand Up @@ -579,4 +581,4 @@ function sdm_charsToNum(chars) --converts characters back into a number
if not found then return nil end --this shouldn't happen unless we give bad chars
end
return num
end
end
2 changes: 2 additions & 0 deletions SuperDuperMacro_Frames.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,10 +13,12 @@ f:SetPoint("TOPLEFT", 0, -104)
sdm_MakeDraggable(f)
f:SetScript("OnShow", function(self)
--PlaySound "igCharacterInfoOpen"
PlaySound(839)
sdm_UpdateList()
end)
f:SetScript("OnHide", function(self)
--PlaySound "igCharacterInfoClose"
PlaySound(840)
sdm_currentlyPlacing=nil
sdm_StopMove()
self:ClearAllPoints()
Expand Down
19 changes: 13 additions & 6 deletions SuperDuperMacro_Interface.lua
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -427,10 +427,16 @@ function sdm_UpdateList()
end
sdm_SetTooltip(listItem, "Alt-click for folder options and instructions")
else
if mTab.icon:upper() == sdm_defaultIcon and mTab.type=="b" and (sdm_UsedByThisChar(mTab)) then
_,texture = GetMacroInfo(sdm_GetMacroIndex(mTab.ID))
-- if mTab.icon:upper() == sdm_defaultIcon and mTab.type=="b" and (sdm_UsedByThisChar(mTab)) then
if type(mTab.icon) == "number" then
texture = mTab.icon
else
texture = "INTERFACE\\ICONS\\"..mTab.icon
if mTab.icon:upper() == sdm_defaultIcon and mTab.type=="b" and (sdm_UsedByThisChar(mTab)) then
_,texture = GetMacroInfo(sdm_GetMacroIndex(mTab.ID))
else
texture = "INTERFACE\\ICONS\\"..mTab.icon
end
-- texture = "INTERFACE\\ICONS\\"..mTab.icon
end
if texture then
listItem.icon:SetTexture(texture)
Expand Down Expand Up @@ -633,7 +639,8 @@ function sdm_OnShow_changeIconFrame(f)
MacroPopupFrame:SetPoint("TOP", f, "BOTTOM", 0,15)
MacroPopupFrame:Show()
_,_,_,_,f.fontstring = MacroPopupFrame:GetRegions()
f.fontstring:SetText(" Different name on button:")
-- f.fontstring:SetText(" Different name on button:")
-- I don't know what is it now, and I try print all returns in MacroPopupFrame:GetRegions() but none of them has 'SetText' method.
MacroPopupOkayButton:Hide()
MacroPopupCancelButton:Hide()
MacroPopupFrame_sdmOkayButton:Show()
Expand Down Expand Up @@ -666,7 +673,7 @@ function sdm_OnHide_changeIconFrame(f)
for _,point in ipairs(f.prevpoints) do
MacroPopupFrame:SetPoint(point[1], point[2], point[3], point[4], point[5])
end
f.fontstring:SetText(MACRO_POPUP_TEXT)
-- f.fontstring:SetText(MACRO_POPUP_TEXT)
f.fontstring:Show()
MacroPopupEditBox:Show()
MacroPopupOkayButton:Show()
Expand All @@ -678,7 +685,7 @@ function sdm_OnHide_changeIconFrame(f)
end

function sdm_GetSelectedIcon()
return GetSpellorMacroIconInfo(MacroPopupFrame.selectedIcon)
return GetSpellorMacroIconInfo(MacroPopupFrame.selectedIcon) -- This will now return a number
end

function sdm_ChangeIconOkayed()
Expand Down