Skip to content
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.

Sign up for GitHub

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

Jump to bottom

Fix selection on multi-click with no shift #9455

Merged
2 commits merged into from
Mar 12, 2021
Merged

Fix selection on multi-click with no shift #9455

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b4be051
Fix selection on multi-click with no shift
Don-Vito Mar 11, 2021
0b1da04
Fix typo in a comment
Don-Vito Mar 11, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 12 additions & 13 deletions src/cascadia/TerminalControl/TermControl.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1372,20 +1372,19 @@ namespace winrt::Microsoft::Terminal::TerminalControl::implementation
_selectionNeedsToBeCopied = false; // there's no selection, so there's nothing to update
}

if (shiftEnabled)
if (shiftEnabled && _terminal->IsSelectionActive())
{
if (_terminal->IsSelectionActive())
{
// If there is a selection we extend it using the selection mode
// (expand the "end"selection point)
_terminal->SetSelectionEnd(terminalPosition, mode);
}
else
{
// If there is no selection we establish it using the selected mode
// (expand both "start" and "end" selection points)
_terminal->MultiClickSelection(terminalPosition, mode);
}
// If shift is pressed and there is a selection we extend it using the selection mode
// (expand the "end"selection point)
_terminal->SetSelectionEnd(terminalPosition, mode);
_selectionNeedsToBeCopied = true;
}
else if (mode != ::Terminal::SelectionExpansionMode::Cell || shiftEnabled)
{
// If we are handling a double / triple-click or shift+single click
// we establish selection using the selected mode
// (expand both "start" and "end" selection points)
_terminal->MultiClickSelection(terminalPosition, mode);
_selectionNeedsToBeCopied = true;
}

Expand Down