Dusk/Guda-ClassicAPI
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fixing category view issues

Browse Source
This commit is contained in:
Salikh Gurgenidze
2026-01-24 16:39:14 +04:00
parent 6ca73b27e1
commit a6eecfe6d3
2 changed files with 83 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files
UI/BagFrame.lua
+38 -16
View File
@@ -185,16 +185,28 @@ end
-- Update a single slot without full frame redraw (used for manual item moves) -- Update a single slot without full frame redraw (used for manual item moves)
-- Returns true if successful, false if full redraw is needed -- Returns true if successful, false if full redraw is needed
function BagFrame:UpdateSingleSlot(bagID, slotID) function BagFrame:UpdateSingleSlot(bagID, slotID, passedButton)
if not Guda_BagFrame:IsShown() then return false end if not Guda_BagFrame:IsShown() then return false end
if currentViewChar then return false end -- Can't do single-slot for other characters if currentViewChar then return false end -- Can't do single-slot for other characters
-- Find the button for this slot in itemButtons -- Use passed button if available (from UpdateChangedSlots iteration)
local targetButton = nil -- This avoids type mismatch issues with slot ID keys (string vs number)
for _, button in ipairs(itemButtons) do local targetButton = passedButton
if button.bagID == bagID and button.slotID == slotID then
targetButton = button if not targetButton then
break -- Fallback: Find the button for this slot using lookup table
if slotToButton[bagID] then
-- Try both numeric and string keys to handle type mismatches
targetButton = slotToButton[bagID][slotID] or slotToButton[bagID][tonumber(slotID)]
end
-- Ultimate fallback: search itemButtons array
if not targetButton then
for _, button in ipairs(itemButtons) do
if button.bagID == bagID and button.slotID == slotID then
targetButton = button
break
end
end
end end
end end
@@ -267,7 +279,8 @@ function BagFrame:UpdateChangedSlots(bagID)
end end
if needsUpdate then if needsUpdate then
if self:UpdateSingleSlot(bagID, slotID) then -- Pass the button directly to avoid type mismatch lookup issues
if self:UpdateSingleSlot(bagID, slotID, targetButton) then
updatedCount = updatedCount + 1 updatedCount = updatedCount + 1
else else
return -1 return -1
@@ -279,10 +292,12 @@ function BagFrame:UpdateChangedSlots(bagID)
-- Category View only has buttons for filled slots, so new items need full redraw -- Category View only has buttons for filled slots, so new items need full redraw
local numSlots = GetContainerNumSlots(bagID) local numSlots = GetContainerNumSlots(bagID)
if numSlots and numSlots > 0 then if numSlots and numSlots > 0 then
for slotID = 1, numSlots do for checkSlotID = 1, numSlots do
-- If slot has an item but no button mapping -> new item arrived -- If slot has an item but no button mapping -> new item arrived
if not slotToButton[bagID][slotID] then -- Check both numeric and potential string keys
local currentLink = GetContainerItemLink(bagID, slotID) local hasButton = slotToButton[bagID][checkSlotID] or slotToButton[bagID][tostring(checkSlotID)]
if not hasButton then
local currentLink = GetContainerItemLink(bagID, checkSlotID)
if currentLink then if currentLink then
return -1 -- Trigger full redraw to categorize new item return -1 -- Trigger full redraw to categorize new item
end end
@@ -298,7 +313,8 @@ function BagFrame:UpdateChangedSlots(bagID)
local updatedCount = 0 local updatedCount = 0
for slotID = 1, numSlots do for slotID = 1, numSlots do
local targetButton = slotToButton[bagID][slotID] -- Try both numeric and string keys to handle type mismatches
local targetButton = slotToButton[bagID][slotID] or slotToButton[bagID][tostring(slotID)]
if not targetButton then if not targetButton then
return -1 return -1
@@ -319,7 +335,8 @@ function BagFrame:UpdateChangedSlots(bagID)
end end
if needsUpdate then if needsUpdate then
if self:UpdateSingleSlot(bagID, slotID) then -- Pass the button directly to avoid type mismatch lookup issues
if self:UpdateSingleSlot(bagID, slotID, targetButton) then
updatedCount = updatedCount + 1 updatedCount = updatedCount + 1
else else
return -1 return -1
@@ -2769,11 +2786,14 @@ function BagFrame:Initialize()
if currentViewChar then return end if currentViewChar then return end
if not Guda_BagFrame:IsShown() then return end if not Guda_BagFrame:IsShown() then return end
-- Only handle player bags (0-4) -- Only handle player bags (0-4) - use tonumber for safe comparison
if not arg1 or arg1 < 0 or arg1 > 4 then return end local bagID = tonumber(arg1)
if not bagID or bagID < 0 or bagID > 4 then
return -- Skip bank bags (5-10) and invalid bags
end
local viewType = addon.Modules.DB:GetSetting("bagViewType") or "single" local viewType = addon.Modules.DB:GetSetting("bagViewType") or "single"
addon:DebugCategory("BAG_UPDATE: bagID=%s, viewType=%s", tostring(arg1), viewType) addon:DebugCategory("BAG_UPDATE (BagFrame): bagID=%d, viewType=%s", bagID, viewType)
-- Check if sorting is in progress - use full redraw with throttle -- Check if sorting is in progress - use full redraw with throttle
local isSorting = addon.Modules.SortEngine and addon.Modules.SortEngine.sortingInProgress local isSorting = addon.Modules.SortEngine and addon.Modules.SortEngine.sortingInProgress
@@ -2788,6 +2808,8 @@ function BagFrame:Initialize()
addon:DebugCategory("BAG_UPDATE: UpdateChangedSlots result=%s", tostring(result)) addon:DebugCategory("BAG_UPDATE: UpdateChangedSlots result=%s", tostring(result))
if result >= 0 then if result >= 0 then
-- Success - updated slots without full redraw -- Success - updated slots without full redraw
-- Cancel any pending full redraw to preserve incremental update
CancelPendingUpdate()
addon:DebugCategory("BAG_UPDATE: Incremental update succeeded, skipping full redraw") addon:DebugCategory("BAG_UPDATE: Incremental update succeeded, skipping full redraw")
return return
end end
UI/BankFrame.lua
+45 -17
View File
@@ -132,7 +132,7 @@ function BankFrame:UpdateLockStates()
end end
-- Update a single slot without full frame redraw (used for manual item moves) -- Update a single slot without full frame redraw (used for manual item moves)
function BankFrame:UpdateSingleSlot(bagID, slotID) function BankFrame:UpdateSingleSlot(bagID, slotID, passedButton)
if not Guda_BankFrame:IsShown() then if not Guda_BankFrame:IsShown() then
addon:DebugCategory("UpdateSingleSlot: frame not shown") addon:DebugCategory("UpdateSingleSlot: frame not shown")
return false return false
@@ -142,15 +142,22 @@ function BankFrame:UpdateSingleSlot(bagID, slotID)
return false return false
end end
-- O(1) button lookup using hash table -- Use passed button if available (from UpdateChangedSlots iteration)
if not bankSlotToButton[bagID] then -- This avoids type mismatch issues with slot ID keys (string vs number)
addon:DebugCategory("UpdateSingleSlot: no slotToButton for bag %d", bagID) local targetButton = passedButton
return false
end
local targetButton = bankSlotToButton[bagID][slotID]
if not targetButton then if not targetButton then
addon:DebugCategory("UpdateSingleSlot: no button for bag %d slot %d", bagID, slotID) -- Fallback to O(1) button lookup using hash table
return false if not bankSlotToButton[bagID] then
addon:DebugCategory("UpdateSingleSlot: no slotToButton for bag %d", bagID)
return false
end
-- Try both numeric and string keys to handle type mismatches
targetButton = bankSlotToButton[bagID][slotID] or bankSlotToButton[bagID][tonumber(slotID)]
if not targetButton then
addon:DebugCategory("UpdateSingleSlot: no button for bag %d slot %d", bagID, slotID)
return false
end
end end
-- Get fresh item data for this slot -- Get fresh item data for this slot
@@ -235,7 +242,8 @@ function BankFrame:UpdateChangedSlots(bagID)
if needsUpdate then if needsUpdate then
addon:DebugCategory(" slot %d: needs update (had=%s, now=%s)", slotID, addon:DebugCategory(" slot %d: needs update (had=%s, now=%s)", slotID,
cachedLink and "item" or "empty", currentLink and "item" or "empty") cachedLink and "item" or "empty", currentLink and "item" or "empty")
if self:UpdateSingleSlot(bagID, slotID) then -- Pass the button directly to avoid type mismatch lookup issues
if self:UpdateSingleSlot(bagID, slotID, targetButton) then
updatedCount = updatedCount + 1 updatedCount = updatedCount + 1
else else
addon:DebugCategory(" slot %d: UpdateSingleSlot failed -> full redraw", slotID) addon:DebugCategory(" slot %d: UpdateSingleSlot failed -> full redraw", slotID)
@@ -248,12 +256,14 @@ function BankFrame:UpdateChangedSlots(bagID)
-- Category View only has buttons for filled slots, so new items need full redraw -- Category View only has buttons for filled slots, so new items need full redraw
local numSlots = addon.Modules.Utils:GetBagSlotCount(bagID) local numSlots = addon.Modules.Utils:GetBagSlotCount(bagID)
if numSlots and numSlots > 0 then if numSlots and numSlots > 0 then
for slotID = 1, numSlots do for checkSlotID = 1, numSlots do
-- If slot has an item but no button mapping -> new item arrived -- If slot has an item but no button mapping -> new item arrived
if not bankSlotToButton[bagID][slotID] then -- Check both numeric and potential string keys
local currentLink = GetContainerItemLink(bagID, slotID) local hasButton = bankSlotToButton[bagID][checkSlotID] or bankSlotToButton[bagID][tostring(checkSlotID)]
if not hasButton then
local currentLink = GetContainerItemLink(bagID, checkSlotID)
if currentLink then if currentLink then
addon:DebugCategory(" slot %d: NEW item arrived (no button) -> full redraw", slotID) addon:DebugCategory(" slot %d: NEW item arrived (no button) -> full redraw", checkSlotID)
return -1 -- Trigger full redraw to categorize new item return -1 -- Trigger full redraw to categorize new item
end end
end end
@@ -272,7 +282,8 @@ function BankFrame:UpdateChangedSlots(bagID)
local updatedCount = 0 local updatedCount = 0
for slotID = 1, numSlots do for slotID = 1, numSlots do
local targetButton = bankSlotToButton[bagID][slotID] -- Try both numeric and string keys to handle type mismatches
local targetButton = bankSlotToButton[bagID][slotID] or bankSlotToButton[bagID][tostring(slotID)]
if not targetButton then if not targetButton then
addon:DebugCategory(" slot %d: no button in single view -> full redraw", slotID) addon:DebugCategory(" slot %d: no button in single view -> full redraw", slotID)
@@ -296,7 +307,8 @@ function BankFrame:UpdateChangedSlots(bagID)
if needsUpdate then if needsUpdate then
addon:DebugCategory(" slot %d: needs update (had=%s, now=%s)", slotID, addon:DebugCategory(" slot %d: needs update (had=%s, now=%s)", slotID,
cachedLink and "item" or "empty", currentLink and "item" or "empty") cachedLink and "item" or "empty", currentLink and "item" or "empty")
if self:UpdateSingleSlot(bagID, slotID) then -- Pass the button directly to avoid type mismatch lookup issues
if self:UpdateSingleSlot(bagID, slotID, targetButton) then
updatedCount = updatedCount + 1 updatedCount = updatedCount + 1
else else
addon:DebugCategory(" slot %d: UpdateSingleSlot failed -> full redraw", slotID) addon:DebugCategory(" slot %d: UpdateSingleSlot failed -> full redraw", slotID)
@@ -1811,7 +1823,11 @@ function BankFrame:Initialize()
updateFrame:RegisterEvent("PLAYERBANKBAGSLOTS_CHANGED") updateFrame:RegisterEvent("PLAYERBANKBAGSLOTS_CHANGED")
updateFrame:RegisterEvent("BAG_UPDATE") updateFrame:RegisterEvent("BAG_UPDATE")
updateFrame:SetScript("OnEvent", function() updateFrame:SetScript("OnEvent", function()
if not addon.Modules.BankScanner:IsBankOpen() then return end local bankOpen = addon.Modules.BankScanner:IsBankOpen()
if not bankOpen then
addon:DebugCategory("BankFrame event %s: bank not open, ignoring", event or "nil")
return
end
if currentViewChar then return end if currentViewChar then return end
-- Check if sorting is in progress - use full redraw with throttle -- Check if sorting is in progress - use full redraw with throttle
@@ -1829,6 +1845,12 @@ function BankFrame:Initialize()
local success = BankFrame:UpdateSingleSlot(-1, arg1) local success = BankFrame:UpdateSingleSlot(-1, arg1)
addon:DebugCategory(" UpdateSingleSlot(-1, %d) = %s", arg1, tostring(success)) addon:DebugCategory(" UpdateSingleSlot(-1, %d) = %s", arg1, tostring(success))
if success then if success then
-- Cancel any pending full redraw - incremental update succeeded
if bankThrottle.pending and bankThrottle.frame then
addon:DebugCategory(" Canceling pending full redraw")
bankThrottle.pending = false
bankThrottle.frame:Hide()
end
return -- Success, no full redraw needed return -- Success, no full redraw needed
end end
end end
@@ -1849,6 +1871,12 @@ function BankFrame:Initialize()
local result = BankFrame:UpdateChangedSlots(arg1) local result = BankFrame:UpdateChangedSlots(arg1)
addon:DebugCategory(" UpdateChangedSlots(%d) = %d", arg1, result) addon:DebugCategory(" UpdateChangedSlots(%d) = %d", arg1, result)
if result >= 0 then if result >= 0 then
-- Cancel any pending full redraw - incremental update succeeded
if bankThrottle.pending and bankThrottle.frame then
addon:DebugCategory(" Canceling pending full redraw")
bankThrottle.pending = false
bankThrottle.frame:Hide()
end
return -- Success, no full redraw needed return -- Success, no full redraw needed
end end
-- Fall through to full redraw -- Fall through to full redraw