From cd6b0832e2d2400f15c3969968440cd6258f026e Mon Sep 17 00:00:00 2001 From: Leonard Hecker Date: Fri, 26 May 2023 21:32:15 +0200 Subject: [PATCH] Hotfix block selection linebreaks in conhost (#15423) MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit This regressed in a1f42e8 which only made changes to Windows Terminal but forgot to make equivalent ones in OpenConsole/conhost. Without this fix, line breaks in block selections are missing if the line doesn't force a wrap via an explicit newline. Closes #15153 ## Validation Steps Performed * Run Far or print long lines of text * Trigger block selection via Ctrl+M or Edit > Mark * Clipboard contains N-1 newlines lines for N selected rows ✅ --- src/interactivity/win32/Clipboard.cpp | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/interactivity/win32/Clipboard.cpp b/src/interactivity/win32/Clipboard.cpp index 55909fdb96..1be0b11f2d 100644 --- a/src/interactivity/win32/Clipboard.cpp +++ b/src/interactivity/win32/Clipboard.cpp @@ -251,7 +251,8 @@ void Clipboard::StoreSelectionToClipboard(const bool copyFormatting) const auto text = buffer.GetText(includeCRLF, trimTrailingWhitespace, selectionRects, - GetAttributeColors); + GetAttributeColors, + selection.IsKeyboardMarkSelection()); CopyTextToSystemClipboard(text, copyFormatting); }