Skip to content

Commit

Permalink
this fixes it in a braindead way. Gonna try and clear some of this up…
Browse files Browse the repository at this point in the history
… though...
  • Loading branch information
zadjii-msft committed Jan 20, 2022
1 parent 4e46c85 commit 5f9c551
Show file tree
Hide file tree
Showing 2 changed files with 6 additions and 1 deletion.
2 changes: 1 addition & 1 deletion src/cascadia/TerminalApp/App.xaml
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
<ResourceDictionary.MergedDictionaries>
<!-- Include the MUX Controls resources -->
<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls"
ControlsResourcesVersion="Version1" />
ControlsResourcesVersion="Version2" />
<ResourceDictionary>

<!--
Expand Down
5 changes: 5 additions & 0 deletions src/cascadia/TerminalApp/TerminalPage.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -1991,6 +1991,11 @@ namespace winrt::TerminalApp::implementation
const auto focusedTab = _GetFocusedTabImpl();
// Do not warn about multi line pasting if the current tab has bracketed paste enabled.
warnMultiLine = warnMultiLine && !focusedTab->GetActiveTerminalControl().BracketedPasteEnabled();
if (!warnLargeText && !warnMultiLine)
{
eventArgs.HandleClipboardData(text);
co_return;
}
}

// We have to initialize the dialog here to be able to change the text of the text block within it
Expand Down

0 comments on commit 5f9c551

Please sign in to comment.