From 6df649163e2038bf7342f1577f1f1a90f26ac4e8 Mon Sep 17 00:00:00 2001
From: Brennan Benson <79079362+brennanb2025@users.noreply.github.com>
Date: Wed, 19 Aug 2026 02:06:54 -0700
Subject: [PATCH] fix(terminal): normalize imported padding for fitting

---
 src/main/ghostty/mapper-extended.test.ts  | 4 ++--
 src/main/ghostty/numeric-config-values.ts | 7 +++----
 2 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/src/main/ghostty/mapper-extended.test.ts b/src/main/ghostty/mapper-extended.test.ts
index 402e9253f21..9584ac75017 100644
--- a/src/main/ghostty/mapper-extended.test.ts
+++ b/src/main/ghostty/mapper-extended.test.ts
@@ -90,9 +90,9 @@ describe('mapGhosttyToOrca — window-padding', () => {
     expect(result.unsupportedKeys).toEqual([])
   })
 
-  it('preserves odd-sum dual-value padding as a fractional average', () => {
+  it('rounds odd-sum dual-value padding to the integer used for fitting', () => {
     const result = mapGhosttyToOrca({ 'window-padding-x': '1,2' })
-    expect(result.diff).toEqual({ terminalPaddingX: 1.5 })
+    expect(result.diff).toEqual({ terminalPaddingX: 2 })
     expect(result.unsupportedKeys).toEqual([])
   })
 
diff --git a/src/main/ghostty/numeric-config-values.ts b/src/main/ghostty/numeric-config-values.ts
index f8a7ce7b468..72db1261022 100644
--- a/src/main/ghostty/numeric-config-values.ts
+++ b/src/main/ghostty/numeric-config-values.ts
@@ -10,9 +10,8 @@ export const parseStrictInt = (v: string): number | null => {
   return Number.isFinite(num) ? num : null
 }
 
-// Why: Ghostty accepts "top,bottom" / "left,right" pairs for window paddings,
-// but Orca stores a single value per axis — average the pair so the total
-// padding along the axis stays the same.
+// Why: Orca stores one integer per axis, so collapse paired paddings to the
+// nearest value that xterm's integer-based fit calculation will also use.
 export const parsePaddingValue = (v: string): number | null => {
   const parts = v.split(',')
   if (parts.length > 2) {
@@ -26,5 +25,5 @@ export const parsePaddingValue = (v: string): number | null => {
     }
     nums.push(num)
   }
-  return nums.reduce((sum, num) => sum + num, 0) / nums.length
+  return Math.round(nums.reduce((sum, num) => sum + num, 0) / nums.length)
 }