Skip to content

Commit

Permalink
Simplify Code
Browse files Browse the repository at this point in the history
  • Loading branch information
@doadin
doadin committed Jul 21, 2024
1 parent 8398042 commit 6d0f4d3
Show file tree
Hide file tree
Showing 4 changed files with 43 additions and 47 deletions.
42 changes: 21 additions & 21 deletions Baggins-Options.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -731,7 +731,7 @@ end

local function refresh()
Baggins:ForceFullRefresh()
Baggins:UpdateBags()
self:Baggins_RefreshBags()
end

local function getCompressAll()
Expand Down Expand Up @@ -787,7 +787,7 @@ function Baggins:RebuildOptions()
set = function(info, value) --luacheck: ignore 212
p.compressall = value
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end,
},
CompressStackable = {
Expand All @@ -800,7 +800,7 @@ function Baggins:RebuildOptions()
set = function(info, value) --luacheck: ignore 212
p.compressstackable = value
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end,
},
CompressShards = {
Expand All @@ -813,7 +813,7 @@ function Baggins:RebuildOptions()
set = function(info, value) --luacheck: ignore 212
p.CompressShards = value
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end,
hidden = Baggins:IsRetailWow(),
},
Expand All @@ -827,7 +827,7 @@ function Baggins:RebuildOptions()
set = function(info, value) --luacheck: ignore 212
p.CompressAmmo = value
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end,
hidden = Baggins:IsRetailWow(),
},
Expand All @@ -841,7 +841,7 @@ function Baggins:RebuildOptions()
set = function(info, value) --luacheck: ignore 212
p.compressempty = value
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end,
},
}
Expand Down Expand Up @@ -922,7 +922,7 @@ function Baggins:RebuildOptions()
set = function(info, value) --luacheck: ignore 212
p.hideduplicates = value
self:ResortSections()
self:UpdateBags()
self:Baggins_RefreshBags()
end,
values = dbl({ 'global', 'bag', 'disabled' }),
},
Expand Down Expand Up @@ -1189,7 +1189,7 @@ function Baggins:RebuildOptions()
get = function() return p.shrinkwidth end,
set = function(info, value) --luacheck: ignore 212
p.shrinkwidth = value
self:UpdateBags()
self:Baggins_RefreshBags()
end,
},
ShrinkTitle = {
Expand All @@ -1200,7 +1200,7 @@ function Baggins:RebuildOptions()
get = function() return p.shrinkbagtitle end,
set = function(info, value) --luacheck: ignore 212
p.shrinkbagtitle = value
self:UpdateBags()
self:Baggins_RefreshBags()
end,
},
Scale = {
Expand All @@ -1225,7 +1225,7 @@ function Baggins:RebuildOptions()
order = 63,
arg = true,
get = function() return p.moneybag < 0 and "None" or tostring(p.moneybag) end,
set = function(info, value) p.moneybag = tonumber(value) or -1 self:UpdateBags() end, --luacheck: ignore 212
set = function(info, value) p.moneybag = tonumber(value) or -1 self:Baggins_RefreshBags() end, --luacheck: ignore 212
values = "GetMoneyBagChoices",
},
ShowBankControls = {
Expand All @@ -1235,7 +1235,7 @@ function Baggins:RebuildOptions()
order = 64,
arg = true,
get = function() return p.bankcontrolbag < 0 and "None" or tostring(p.bankcontrolbag) end,
set = function(info, value) p.bankcontrolbag = tonumber(value) or -1 self:UpdateBags() end, --luacheck: ignore 212
set = function(info, value) p.bankcontrolbag = tonumber(value) or -1 self:Baggins_RefreshBags() end, --luacheck: ignore 212
values = "GetBankControlsBagChoices",
},
DisableBagRightClick = {
Expand All @@ -1261,7 +1261,7 @@ function Baggins:RebuildOptions()
get = function() return p.section_layout end,
set = function(info, value) --luacheck: ignore 212
p.section_layout = value
self:UpdateBags()
self:Baggins_RefreshBags()
end,
values = {
default = "Default", -- TODO: Localize
Expand All @@ -1277,7 +1277,7 @@ function Baggins:RebuildOptions()
get = function() return p.showsectiontitle end,
set = function(info, value) --luacheck: ignore 212
p.showsectiontitle = value
self:UpdateBags()
self:Baggins_RefreshBags()
end
},
HideEmptySections = {
Expand All @@ -1288,7 +1288,7 @@ function Baggins:RebuildOptions()
get = function() return p.hideemptysections end,
set = function(info, value) --luacheck: ignore 212
p.hideemptysections = value
self:UpdateBags()
self:Baggins_RefreshBags()
end
},
HideEmptyBags = {
Expand All @@ -1299,7 +1299,7 @@ function Baggins:RebuildOptions()
get = function() return p.hideemptybags end,
set = function(info, value) --luacheck: ignore 212
p.hideemptybags = value
self:UpdateBags()
self:Baggins_RefreshBags()
end
},
Sort = {
Expand All @@ -1308,7 +1308,7 @@ function Baggins:RebuildOptions()
desc = L["How items are sorted"],
order = 100,
get = function() return p.sort end,
set = function(info, value) p.sort = value self:UpdateBags() end, --luacheck: ignore 212
set = function(info, value) p.sort = value self:Baggins_RefreshBags() end, --luacheck: ignore 212
values = dbl({'quality', 'name', 'type', 'slot', 'ilvl' }),
},
SortNewFirst = {
Expand All @@ -1325,7 +1325,7 @@ function Baggins:RebuildOptions()
desc = L["Number of Columns shown in the bag frames"],
order = 110,
get = function() return p.columns end,
set = function(info, value) p.columns = value self:UpdateBags() end, --luacheck: ignore 212
set = function(info, value) p.columns = value self:Baggins_RefreshBags() end, --luacheck: ignore 212
min = 2,
max = 20,
step = 1,
Expand Down Expand Up @@ -3688,7 +3688,7 @@ function Baggins:OnProfileEnable()
self:SetCategoryTable(self.db.profile.categories)
self:ResortSections()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:BuildMoneyBagOptions()
self:BuildBankControlsBagOptions()
end
Expand All @@ -3706,7 +3706,7 @@ end
local function disableCompressionTemp()
Baggins.tempcompressnone = not Baggins.tempcompressnone
Baggins:RebuildSectionLayouts()
Baggins:UpdateBags()
self:Baggins_RefreshBags()
end

local function openBagCategoryConfig()
Expand Down Expand Up @@ -3846,15 +3846,15 @@ end

local function setBagPriority(info, value)
Baggins:ResortSections()
Baggins:UpdateBags()
self:Baggins_RefreshBags()
info.arg.priority = value
end

local function setAllowdupes(info, value)
info.arg.allowdupes = value
Baggins:ResortSections()
Baggins:ForceFullRefresh()
Baggins:UpdateBags()
self:Baggins_RefreshBags()
end

local tmp = {}
Expand Down
2 changes: 1 addition & 1 deletion Baggins-Skins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ function Baggins:EnableSkin(name)
bagframe.dirty = true
end
self.currentSkin = newskin
self:UpdateBags()
self:Baggins_RefreshBags()
end
end

Expand Down
42 changes: 19 additions & 23 deletions Baggins.lua
View file
Original file line number Diff line number Diff line change
Expand Up @@ -194,7 +194,7 @@ local function initDropdownMenu()
tooltipText = L["Forces a Full Refresh of item sorting"],
func = function()
Baggins:ForceFullRefresh()
Baggins:UpdateBags()
self:Baggins_RefreshBags()
end,
notCheckable = true,
},
Expand Down Expand Up @@ -237,7 +237,7 @@ local function initDropdownMenu()
tooltipText = L["Forces a Full Refresh of item sorting"],
func = function()
Baggins:ForceFullRefresh()
Baggins:UpdateBags()
self:Baggins_RefreshBags()
end,
notCheckable = true,
},
Expand Down Expand Up @@ -462,7 +462,7 @@ function Baggins:OnProfileEnable()
self:SetCategoryTable(self.db.profile.categories)
self:ResortSections()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:BuildMoneyBagOptions()
self:BuildBankControlsBagOptions()
end
Expand Down Expand Up @@ -532,7 +532,7 @@ function Baggins:OnEnable()
end

function Baggins:Baggins_CategoriesChanged()
self:UpdateBags()
self:Baggins_RefreshBags()
self.doInitialBankUpdate = true
end

Expand Down Expand Up @@ -767,7 +767,7 @@ function Baggins:OnReagentBankPurchased()
self:CheckSlotsChanged(bagid, true)
end
end
self:UpdateBags()
self:Baggins_RefreshBags()
end

function Baggins:OnBankSlotPurchased()
Expand All @@ -780,16 +780,12 @@ function Baggins:OnBankSlotPurchased()
self:CheckSlotsChanged(bagid, true)
end
end
self:UpdateBags()
self:Baggins_RefreshBags()
end

-------------------------
-- Update Bag Contents --
-------------------------
function Baggins:UpdateBags()
self:Baggins_RefreshBags()
end

function Baggins:Baggins_RefreshBags()
for bagid,bagframe in pairs(self.bagframes) do
for _,sectionframe in pairs(bagframe.sections) do
Expand Down Expand Up @@ -1204,7 +1200,7 @@ function Baggins:RunBagUpdates(event,bagid)
bagupdatebucket[bag] = nil
end
if itemschanged then
self:UpdateBags()
self:Baggins_RefreshBags()
self:ReallyUpdateBags()
else
self:UpdateItemButtons()
Expand Down Expand Up @@ -1669,7 +1665,7 @@ function Baggins:UpdateBagFrameSize(bagid)
local bagframe = self.bagframes[bagid]
if not bagframe then return end
bagframe.dirty = true
self:UpdateBags()
self:Baggins_RefreshBags()
end

function Baggins:ReallyUpdateBagFrameSize(bagid)
Expand Down Expand Up @@ -1858,7 +1854,7 @@ function Baggins:LayoutSection(sectionframe, title, cols)
sectionframe.dirty = true
sectionframe.set_title = title
sectionframe.set_columns = cols
self:UpdateBags()
self:Baggins_RefreshBags()
end

function Baggins:ReallyLayoutSection(sectionframe, cols)
Expand Down Expand Up @@ -2547,7 +2543,7 @@ do

local function Click(_, arg1, arg2)
Baggins:IncludeItemInCategory(arg1, arg2)
Baggins:UpdateBags()
self:Baggins_RefreshBags()
end

local dd_categories, dd_id
Expand Down Expand Up @@ -3436,7 +3432,7 @@ end

function Baggins:LayoutBagFrames()
self.dirtyBagLayout = true
self:UpdateBags()
self:Baggins_RefreshBags()
end

local CONTAINER_SPACING = 0
Expand Down Expand Up @@ -3817,7 +3813,7 @@ function Baggins:NewBag(bagname)
currentbag = #bags
self:ResortSections()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
self:BuildMoneyBagOptions()
self:BuildBankControlsBagOptions()
Expand Down Expand Up @@ -3879,7 +3875,7 @@ function Baggins:RemoveBag(bagid)
self:ResetCatInUse()
self:ResortSections()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
local numbags, numbagframes = #self.db.profile.bags, #self.bagframes
for i = numbags+1, numbagframes do
Expand All @@ -3896,7 +3892,7 @@ function Baggins:NewSection(bagid,sectionname)
currentsection = #self.db.profile.bags[bagid].sections
self:ResortSections()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
end

Expand All @@ -3914,15 +3910,15 @@ function Baggins:RemoveSection(bagid, sectionid)
self:ResetCatInUse()
self:ResortSections()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
end

function Baggins:AddRule()
--tablet:Refresh("BagginsEditCategories")
Baggins:OnRuleChanged()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
end

Expand All @@ -3931,15 +3927,15 @@ function Baggins:RemoveRule(catid, ruleid)
--tablet:Refresh("BagginsEditCategories")
Baggins:OnRuleChanged()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
end

function Baggins:AddCategory(bagid,sectionid,category)
tinsert(self.db.profile.bags[bagid].sections[sectionid].cats,category)
self:ResetCatInUse(category)
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
end

Expand Down Expand Up @@ -3999,7 +3995,7 @@ function Baggins:RemoveCategory(bagid,sectionid,catid)
tremove(p.bags[bagid].sections[sectionid].cats,catid)
self:ResetCatInUse()
self:ForceFullRefresh()
self:UpdateBags()
self:Baggins_RefreshBags()
self:UpdateLayout()
end
end
Expand Down
4 changes: 2 additions & 2 deletions bindings.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,12 +9,12 @@
if Baggins:getCompressAll() then
Baggins.db.profile.compressall = false
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end
if not Baggins:getCompressAll() then
Baggins.db.profile.compressall = true
self:RebuildSectionLayouts()
self:UpdateBags()
self:Baggins_RefreshBags()
end
</Binding>
</Bindings>

0 comments on commit 6d0f4d3

Please sign in to comment.