Merge branch 'dev/cazamor/kbd-sln/polish' of https://github.com/micro…

…soft/terminal into dev/cazamor/kbd-sln/polish
microsoft · Jun 23, 2022 · 40ee74e · 40ee74e
2 parents 06a39f8 + 0b54345
commit 40ee74e
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 3 deletions.
diff --git a/src/cascadia/TerminalControl/ControlCore.h b/src/cascadia/TerminalControl/ControlCore.h
@@ -80,7 +80,7 @@ namespace winrt::Microsoft::Terminal::Control::implementation
 
         void SendInput(const winrt::hstring& wstr);
         void PasteText(const winrt::hstring& hstr);
-        bool CopySelectionToClipboard(bool singleLine, const Windows::Foundation::IReference<CopyFormat>& formats, bool clearSelection = false);
+        bool CopySelectionToClipboard(bool singleLine, const Windows::Foundation::IReference<CopyFormat>& formats, bool clearSelection = true);
         void SelectAll();
         bool ToggleBlockSelection();
         void ToggleMarkMode();

diff --git a/src/cascadia/TerminalCore/Terminal.hpp b/src/cascadia/TerminalCore/Terminal.hpp
@@ -262,7 +262,7 @@ class Microsoft::Terminal::Core::Terminal final :
     void SetBlockSelection(const bool isEnabled) noexcept;
     void UpdateSelection(SelectionDirection direction, SelectionExpansion mode, ControlKeyStates mods);
     void SelectAll();
-    bool IsInQuickEditMode() const;
+    const bool IsInQuickEditMode() const noexcept;
     bool IsInMarkMode() const;
     void ToggleMarkMode();
 

diff --git a/src/cascadia/TerminalCore/TerminalSelection.cpp b/src/cascadia/TerminalCore/TerminalSelection.cpp
@@ -280,7 +280,7 @@ void Terminal::SetBlockSelection(const bool isEnabled) noexcept
     _blockSelection = isEnabled;
 }
 
-bool Terminal::IsInQuickEditMode() const
+const bool Terminal::IsInQuickEditMode() const noexcept
 {
     return _quickEditMode;
 }