Skip to content

Commit

Permalink
Partially-addressed #15 - Fix "Change Name/Icon"
Browse files Browse the repository at this point in the history
  • Loading branch information
spiralofhope committed Jan 17, 2019
1 parent 6bf1769 commit fbe174d
Showing 1 changed file with 12 additions and 12 deletions.
24 changes: 12 additions & 12 deletions SuperDuperMacro_Interface.lua
Original file line number Diff line number Diff line change
Expand Up @@ -445,7 +445,7 @@ function sdm_UpdateList()
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
texture = "INTERFACE\\ICONS\\" .. mTab.icon
end
end

Expand Down Expand Up @@ -653,19 +653,19 @@ function sdm_OnShow_changeIconFrame(f)
MacroPopupFrame:SetParent(f)
MacroPopupFrame:SetPoint("TOP", f, "BOTTOM", 0,15)
MacroPopupFrame:Show()
_,_,_,_,f.fontstring = MacroPopupFrame:GetRegions()
_,_,_,_,f.fontstring = MacroPopupFrame.BorderBox:GetRegions()

-- https://github.com/a08381 says:
-- I don't know what is it now, and I try print all returns in MacroPopupFrame:GetRegions() but none of them has 'SetText' method.
-- https://github.com/spiralofhope/SuperDuperMacro/pull/6
--f.fontstring:SetText(" Different name on button:")

MacroPopupOkayButton:Hide()
MacroPopupCancelButton:Hide()
MacroPopupFrame_sdmOkayButton:Show()
MacroPopupFrame_sdmCancelButton:Show()
if mTab.type=="b" then
if (not mTab.buttonName) then
--MacroPopupFrame.BorderBox.OkayButton:Hide()
--MacroPopupFrame.BorderBox.CancelButton:Hide()
--MacroPopupFrame_sdmOkayButton:Show()
--MacroPopupFrame_sdmCancelButton:Show()
if mTab.type == 'b' then
if ( not mTab.buttonName ) then
MacroPopupFrame_buttonTextCheckBox:SetChecked(nil)
else
MacroPopupFrame_buttonTextCheckBox:SetChecked(1)
Expand Down Expand Up @@ -698,10 +698,10 @@ function sdm_OnHide_changeIconFrame(f)

f.fontstring:Show()
MacroPopupEditBox:Show()
MacroPopupOkayButton:Show()
MacroPopupCancelButton:Show()
MacroPopupFrame_sdmOkayButton:Hide()
MacroPopupFrame_sdmCancelButton:Hide()
--MacroPopupFrame.BorderBox.OkayButton:Show()
--MacroPopupFrame.BorderBox.CancelButton:Show()
--MacroPopupFrame_sdmOkayButton:Hide()
--MacroPopupFrame_sdmCancelButton:Hide()
MacroPopupFrame:Hide()
MacroPopupFrame_buttonTextCheckBox:Hide()
end
Expand Down

0 comments on commit fbe174d

Please sign in to comment.