-
Notifications
You must be signed in to change notification settings - Fork 8.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Miscellaneous bug fixes for Mark Mode #13358
Merged
Merged
Changes from 12 commits
Commits
Show all changes
13 commits
Select commit
Hold shift + click to select a range
cdbe030
Miscellaneous bug fixes for Mark Mode
carlos-zamora 654bb08
fix copyOnSelect interactions with keyboard selection
carlos-zamora 0b54345
Fix a few method signatures
carlos-zamora 06a39f8
bugfix: correctly show markers when one cell selected
carlos-zamora 40ee74e
Merge branch 'dev/cazamor/kbd-sln/polish' of https://github.com/micro…
carlos-zamora 408fca2
spell fix
carlos-zamora a2a346b
Merge branch 'main' into dev/cazamor/kbd-sln/polish
carlos-zamora 32ca437
combine mark mode and quick edit mode
carlos-zamora 0c5a1e9
fix clamping the selection at top/bottom properly
carlos-zamora c78818a
add toggleBlockSelection to schema
carlos-zamora ce6c87e
address Dustin's feedback
carlos-zamora 1a84bc6
split copy and clear sln; simplify logic
carlos-zamora b8b2d76
remove the bool from _updateSelectionUI
carlos-zamora File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -142,7 +142,6 @@ namespace winrt::Microsoft::Terminal::Control::implementation | |
// Method Description: | ||
// - Given a copy-able selection, get the selected text from the buffer and send it to the | ||
// Windows Clipboard (CascadiaWin32:main.cpp). | ||
// - CopyOnSelect does NOT clear the selection | ||
// Arguments: | ||
// - singleLine: collapse all of the text to one line | ||
// - formats: which formats to copy (defined by action's CopyFormatting arg). nullptr | ||
|
@@ -257,15 +256,15 @@ namespace winrt::Microsoft::Terminal::Control::implementation | |
} | ||
else if (WI_IsFlagSet(buttonState, MouseButtonState::IsRightButtonDown)) | ||
{ | ||
// CopyOnSelect right click always pastes | ||
if (_core->CopyOnSelect() || !_core->HasSelection()) | ||
// Try to copy the text and clear the selection | ||
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. It could be helpful to mention here that |
||
const auto successfulCopy = CopySelectionToClipboard(shiftEnabled, nullptr); | ||
_core->ClearSelection(); | ||
if (_core->CopyOnSelect() || !successfulCopy) | ||
{ | ||
// CopyOnSelect: right click always pastes! | ||
// Otherwise: no selection --> paste | ||
RequestPasteTextFromClipboard(); | ||
} | ||
else | ||
{ | ||
CopySelectionToClipboard(shiftEnabled, nullptr); | ||
} | ||
} | ||
} | ||
|
||
|
@@ -383,6 +382,9 @@ namespace winrt::Microsoft::Terminal::Control::implementation | |
isLeftMouseRelease && | ||
_selectionNeedsToBeCopied) | ||
{ | ||
// IMPORTANT! | ||
// DO NOT clear the selection here! | ||
// Otherwise, the selection will be cleared immediately after you make it. | ||
CopySelectionToClipboard(false, nullptr); | ||
} | ||
|
||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The namespace qualifier seems overly specific. FYI this should work as expected from other languages:
using ::Microsoft::Terminal::Core::Terminal::SelectionInteractionMode;