From 9e48bb6f5383be8902435230a253c6bef6bfe293 Mon Sep 17 00:00:00 2001 From: CodyTseng Date: Tue, 2 Jul 2019 23:45:01 +0800 Subject: [PATCH] Make padding applied as swap chain panel's margin --- src/cascadia/TerminalControl/TermControl.cpp | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/src/cascadia/TerminalControl/TermControl.cpp b/src/cascadia/TerminalControl/TermControl.cpp index 356c286fa10..9d16c40a4f3 100644 --- a/src/cascadia/TerminalControl/TermControl.cpp +++ b/src/cascadia/TerminalControl/TermControl.cpp @@ -171,9 +171,9 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation uint32_t bg = _settings.DefaultBackground(); _BackgroundColorChanged(bg); - // Apply padding to the root Grid + // Apply padding as swapChainPanel's margin auto thickness = _ParseThicknessFromPadding(_settings.Padding()); - _root.Padding(thickness); + _swapChainPanel.Margin(thickness); // Initialize our font information. const auto* fontFace = _settings.FontFace().c_str(); @@ -1475,8 +1475,8 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation { // Exclude padding from cursor position calculation COORD terminalPosition = { - static_cast(cursorPosition.X - _root.Padding().Left), - static_cast(cursorPosition.Y - _root.Padding().Top) + static_cast(cursorPosition.X - _swapChainPanel.Margin().Left), + static_cast(cursorPosition.Y - _swapChainPanel.Margin().Top) }; const auto fontSize = _actualFont.GetSize();