From 85dea3a9f89b24b4dc881cd73fed1d0430cad01a Mon Sep 17 00:00:00 2001 From: meehl Date: Wed, 27 May 2026 08:06:42 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding/pull/9440 --- src/Classes/ItemsTab.lua.rej | 27 +++++++++++++++++++++++++++ 1 file changed, 27 insertions(+) create mode 100644 src/Classes/ItemsTab.lua.rej diff --git a/src/Classes/ItemsTab.lua.rej b/src/Classes/ItemsTab.lua.rej new file mode 100644 index 0000000000..42bc72983b --- /dev/null +++ b/src/Classes/ItemsTab.lua.rej @@ -0,0 +1,27 @@ +diff a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua (rejected hunks) +@@ -1307,6 +1307,14 @@ function ItemsTabClass:Draw(viewPort, inputEvents) + + self:UpdateSockets() + ++ if main.portraitMode then ++ self.controls.itemList:SetAnchor("TOPRIGHT", self.lastSlot, "BOTTOMRIGHT", 0, 40) ++ else ++ self.controls.itemList:SetAnchor("TOPLEFT", self.controls.setManage, "TOPRIGHT", 20, 20) ++ end ++ self.controls.craftDisplayItem:SetAnchor("TOPLEFT", main.portraitMode and self.controls.setManage or self.controls.itemList, "TOPRIGHT", 20, main.portraitMode and 0 or -20) ++ self.anchorDisplayItem:SetAnchor("TOPLEFT", main.portraitMode and self.controls.setManage or self.controls.itemList, "TOPRIGHT", 20, main.portraitMode and 0) ++ + self:DrawControls(viewPort) + if self.controls.scrollBarH:IsShown() then + self.controls.scrollBarH:Draw(viewPort) +@@ -1424,10 +1432,6 @@ function ItemsTabClass:UpdateSockets() + self.sockets[nodeId].label = "Socket #"..index + self.lastSlot = self.sockets[nodeId] + end +- +- if main.portraitMode then +- self.controls.itemList:SetAnchor("TOPRIGHT",self.lastSlot,"BOTTOMRIGHT", 0, 40) +- end + end + + -- Returns the slot control and equipped jewel for the given node ID From 9db2046cd2e82ada6a19649771e3045ab9afc253 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Wed, 27 May 2026 18:10:46 +1000 Subject: [PATCH 2/2] Fix merge --- src/Classes/ItemsTab.lua | 12 ++++++++---- src/Classes/ItemsTab.lua.rej | 27 --------------------------- 2 files changed, 8 insertions(+), 31 deletions(-) delete mode 100644 src/Classes/ItemsTab.lua.rej diff --git a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua index 10a6f179e9..2b5c6ca0a5 100644 --- a/src/Classes/ItemsTab.lua +++ b/src/Classes/ItemsTab.lua @@ -1309,6 +1309,14 @@ function ItemsTabClass:Draw(viewPort, inputEvents) -- Update weapon slots in case we got Giant's Blood from somewhere self.slots["Weapon 2"]:Populate() self.slots["Weapon 2 Swap"]:Populate() + + if main.portraitMode then + self.controls.itemList:SetAnchor("TOPRIGHT", self.lastSlot, "BOTTOMRIGHT", 0, 40) + else + self.controls.itemList:SetAnchor("TOPLEFT", self.controls.setManage, "TOPRIGHT", 20, 20) + end + self.controls.craftDisplayItem:SetAnchor("TOPLEFT", main.portraitMode and self.controls.setManage or self.controls.itemList, "TOPRIGHT", 20, main.portraitMode and 0 or -20) + self.anchorDisplayItem:SetAnchor("TOPLEFT", main.portraitMode and self.controls.setManage or self.controls.itemList, "TOPRIGHT", 20, main.portraitMode and 0) self:DrawControls(viewPort) if self.controls.scrollBarH:IsShown() then @@ -1427,10 +1435,6 @@ function ItemsTabClass:UpdateSockets() self.sockets[nodeId].label = "Socket #"..index self.lastSlot = self.sockets[nodeId] end - - if main.portraitMode then - self.controls.itemList:SetAnchor("TOPRIGHT",self.lastSlot,"BOTTOMRIGHT", 0, 40) - end self.initSockets = false end diff --git a/src/Classes/ItemsTab.lua.rej b/src/Classes/ItemsTab.lua.rej deleted file mode 100644 index 42bc72983b..0000000000 --- a/src/Classes/ItemsTab.lua.rej +++ /dev/null @@ -1,27 +0,0 @@ -diff a/src/Classes/ItemsTab.lua b/src/Classes/ItemsTab.lua (rejected hunks) -@@ -1307,6 +1307,14 @@ function ItemsTabClass:Draw(viewPort, inputEvents) - - self:UpdateSockets() - -+ if main.portraitMode then -+ self.controls.itemList:SetAnchor("TOPRIGHT", self.lastSlot, "BOTTOMRIGHT", 0, 40) -+ else -+ self.controls.itemList:SetAnchor("TOPLEFT", self.controls.setManage, "TOPRIGHT", 20, 20) -+ end -+ self.controls.craftDisplayItem:SetAnchor("TOPLEFT", main.portraitMode and self.controls.setManage or self.controls.itemList, "TOPRIGHT", 20, main.portraitMode and 0 or -20) -+ self.anchorDisplayItem:SetAnchor("TOPLEFT", main.portraitMode and self.controls.setManage or self.controls.itemList, "TOPRIGHT", 20, main.portraitMode and 0) -+ - self:DrawControls(viewPort) - if self.controls.scrollBarH:IsShown() then - self.controls.scrollBarH:Draw(viewPort) -@@ -1424,10 +1432,6 @@ function ItemsTabClass:UpdateSockets() - self.sockets[nodeId].label = "Socket #"..index - self.lastSlot = self.sockets[nodeId] - end -- -- if main.portraitMode then -- self.controls.itemList:SetAnchor("TOPRIGHT",self.lastSlot,"BOTTOMRIGHT", 0, 40) -- end - end - - -- Returns the slot control and equipped jewel for the given node ID