From b668b3b5c202de389a2a42b837912a3be326197c Mon Sep 17 00:00:00 2001
From: Mike Griese <migrie@microsoft.com>
Date: Mon, 23 Mar 2020 16:50:29 -0500
Subject: [PATCH] Make sure to account for the size the padding _will be_
 scaled to

  * [x] Fixes #2061 for good this time
---
 src/cascadia/TerminalControl/TermControl.cpp | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp
index 0d955716ca0..47d93ca8591 100644
--- a/src/cascadia/TerminalControl/TermControl.cpp
+++ b/src/cascadia/TerminalControl/TermControl.cpp
@@ -1975,8 +1975,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
 
         double height = rows * fFontHeight;
         auto thickness = _ParseThicknessFromPadding(settings.Padding());
-        width += thickness.Left + thickness.Right;
-        height += thickness.Top + thickness.Bottom;
+        // GH#2061 - make sure to account for the size the padding _will be_ scaled to
+        width += scale * (thickness.Left + thickness.Right);
+        height += scale * (thickness.Top + thickness.Bottom);
 
         return { gsl::narrow_cast<float>(width), gsl::narrow_cast<float>(height) };
     }