From 9111f8e8aeb2ccebfdf111152b9317608e163b3b Mon Sep 17 00:00:00 2001 From: vaisest Date: Fri, 26 Jun 2026 14:54:43 +0000 Subject: [PATCH 1/2] Apply changes from https://github.com/PathOfBuildingCommunity/PathOfBuilding-PoE2/pull/2183 --- src/Classes/CalcBreakdownControl.lua | 9 +++++---- src/Classes/Tooltip.lua.rej | 10 ++++++++++ 2 files changed, 15 insertions(+), 4 deletions(-) create mode 100644 src/Classes/Tooltip.lua.rej diff --git a/src/Classes/CalcBreakdownControl.lua b/src/Classes/CalcBreakdownControl.lua index c93ff9f84c1..9b11440c4fa 100644 --- a/src/Classes/CalcBreakdownControl.lua +++ b/src/Classes/CalcBreakdownControl.lua @@ -689,10 +689,11 @@ function CalcBreakdownClass:Draw(viewPort) else SetDrawColor(0.33, 0.66, 0.33) end - DrawImage(nil, x, y, width, 2) - DrawImage(nil, x, y + height - 2, width, 2) - DrawImage(nil, x, y, 2, height) - DrawImage(nil, x + width - 2, y, 2, height) + local borderThickness = 2 + DrawImage(nil, x, y, width, borderThickness) + DrawImage(nil, x, y + height - borderThickness, width, borderThickness) + DrawImage(nil, x, y, borderThickness, height) + DrawImage(nil, x + width - borderThickness, y, borderThickness, height) SetDrawLayer(nil, 10) self:DrawControls(viewPort) -- Draw the sections diff --git a/src/Classes/Tooltip.lua.rej b/src/Classes/Tooltip.lua.rej new file mode 100644 index 00000000000..27e45bce1a9 --- /dev/null +++ b/src/Classes/Tooltip.lua.rej @@ -0,0 +1,10 @@ +diff a/src/Classes/Tooltip.lua b/src/Classes/Tooltip.lua (rejected hunks) +@@ -11,7 +11,7 @@ local s_gmatch = string.gmatch + + -- Constants + +-local BORDER_WIDTH = 3 ++local BORDER_WIDTH = 1 + local H_PAD = 12 + local V_PAD = 10 + -- spell-checker: disable From 2f13399a3a26df638ad7b3ba5d6ae73a264ed144 Mon Sep 17 00:00:00 2001 From: LocalIdentity Date: Tue, 21 Jul 2026 13:18:10 +1000 Subject: [PATCH 2/2] Fix merge issue --- src/Classes/Tooltip.lua | 2 +- src/Classes/Tooltip.lua.rej | 10 ---------- 2 files changed, 1 insertion(+), 11 deletions(-) delete mode 100644 src/Classes/Tooltip.lua.rej diff --git a/src/Classes/Tooltip.lua b/src/Classes/Tooltip.lua index 26f47c87e4f..ae04e9549c4 100644 --- a/src/Classes/Tooltip.lua +++ b/src/Classes/Tooltip.lua @@ -11,7 +11,7 @@ local s_gmatch = string.gmatch -- Constants -local BORDER_WIDTH = 3 +local BORDER_WIDTH = 1 local H_PAD = 12 local V_PAD = 10 diff --git a/src/Classes/Tooltip.lua.rej b/src/Classes/Tooltip.lua.rej deleted file mode 100644 index 27e45bce1a9..00000000000 --- a/src/Classes/Tooltip.lua.rej +++ /dev/null @@ -1,10 +0,0 @@ -diff a/src/Classes/Tooltip.lua b/src/Classes/Tooltip.lua (rejected hunks) -@@ -11,7 +11,7 @@ local s_gmatch = string.gmatch - - -- Constants - --local BORDER_WIDTH = 3 -+local BORDER_WIDTH = 1 - local H_PAD = 12 - local V_PAD = 10 - -- spell-checker: disable