From 01bd55145841f4701ca59a6f76362c16a9606517 Mon Sep 17 00:00:00 2001 From: vaisest Date: Tue, 23 Jun 2026 07:12:43 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2175 --- src/Classes/ItemsTab.lua | 2 +- src/Classes/ItemsTab.lua.rej | 16 ++++++++++++++++ 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 src/Classes/ItemsTab.lua.rej diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua index e6083ea7839..89401381b9b 100644 --- a/src/Classes/ItemsTab.lua +++ b/src/Classes/ItemsTab.lua @@ -695,7 +695,7 @@ holding Shift will put it in the second.]]) end return h end}) - for i = 1, 6 do + for i = 1, maxModCount do local prev = self.controls["displayItemAffix"..(i-1)] or self.controls.displayItemSectionAffix local drop, slider local function verifyRange(range, index, drop) -- flips range if it will form discontinuous values diff --git a/src/Classes/ItemsTab.lua.rej b/src/Classes/ItemsTab.lua.rej new file mode 100644 index 00000000000..1f2fd293666 --- /dev/null +++ b/src/Classes/ItemsTab.lua.rej @@ -0,0 +1,16 @@ +diff a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua (rejected hunks) +@@ -702,12 +702,13 @@ holding Shift will put it in the second.]]) + end + + -- Section: Affix Selection ++ local maxModCount = 9 + self.controls.displayItemSectionAffix = new("Control", {"TOPLEFT",self.controls.displayItemSectionRune,"BOTTOMLEFT"}, {0, 0, 0, function() + if not self.displayItem or not self.displayItem.crafted then + return 0 + end + local h = 6 +- for i = 1, 6 do ++ for i = 1, maxModCount do + if self.controls["displayItemAffix"..i]:IsShown() then + h = h + 24 + if self.controls["displayItemAffixRange"..i]:IsShown() then From 648be47cd2dcdab8c15ef90b3d6234b2d7a4dad1 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Tue, 21 Jul 2026 13:24:36 +1000 Subject: [PATCH 2/2] Fix merge issue --- src/Classes/ItemsTab.lua | 3 ++- src/Classes/ItemsTab.lua.rej | 16 ---------------- 2 files changed, 2 insertions(+), 17 deletions(-) delete mode 100644 src/Classes/ItemsTab.lua.rej diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua index 89401381b9b..6c21b4ae993 100644 --- a/src/Classes/ItemsTab.lua +++ b/src/Classes/ItemsTab.lua @@ -680,12 +680,13 @@ holding Shift will put it in the second.]]) end) -- Section: Affix Selection + local maxModCount = 9 self.controls.displayItemSectionAffix = new("Control", {"TOPLEFT",self.controls.displayItemSectionClusterJewel,"BOTTOMLEFT"}, {0, 0, 0, function() if not self.displayItem or not self.displayItem.crafted then return 0 end local h = 6 - for i = 1, 6 do + for i = 1, maxModCount do if self.controls["displayItemAffix"..i]:IsShown() then h = h + 24 if self.controls["displayItemAffixRange"..i]:IsShown() then diff --git a/src/Classes/ItemsTab.lua.rej b/src/Classes/ItemsTab.lua.rej deleted file mode 100644 index 1f2fd293666..00000000000 --- a/src/Classes/ItemsTab.lua.rej +++ /dev/null @@ -1,16 +0,0 @@ -diff a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua (rejected hunks) -@@ -702,12 +702,13 @@ holding Shift will put it in the second.]]) - end - - -- Section: Affix Selection -+ local maxModCount = 9 - self.controls.displayItemSectionAffix = new("Control", {"TOPLEFT",self.controls.displayItemSectionRune,"BOTTOMLEFT"}, {0, 0, 0, function() - if not self.displayItem or not self.displayItem.crafted then - return 0 - end - local h = 6 -- for i = 1, 6 do -+ for i = 1, maxModCount do - if self.controls["displayItemAffix"..i]:IsShown() then - h = h + 24 - if self.controls["displayItemAffixRange"..i]:IsShown() then