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

Only snap on key _downs_ #6517

Merged
2 commits merged into from
Jun 15, 2020
Merged

Only snap on key _downs_ #6517

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
9f3c5d6
Only snap on characters and some special keys
zadjii-msft Jun 15, 2020
e0675df
this is much simpler
zadjii-msft Jun 15, 2020
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
16 changes: 3 additions & 13 deletions src/cascadia/TerminalCore/Terminal.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -419,13 +419,9 @@ bool Terminal::SendKeyEvent(const WORD vkey,
{
// GH#6423 - don't snap on this key if the key that was pressed was a
// modifier key. We'll wait for a real keystroke to snap to the bottom.
// GH#6481 - Additionally, we'll only snap if this is one of a few specific
// keys that typically count as "input", but don't send a character.
// Otherwise, SendCharEvent handles snapping for most keys.
if (!KeyEvent::IsModifierKey(vkey) &&
(((vkey >= VK_PRIOR) && (vkey <= VK_DOWN)) || // PgUp,PgDn, Home, End, Arrows
((vkey >= VK_INSERT) && (vkey <= VK_DELETE)) || // insert & delete
((vkey >= VK_NUMPAD0) && (vkey <= VK_F24)))) // numpad and F keys
// GH#6481 - Additionally, make sure the key was actually pressed. This
// check will make sure we behave the same as before GH#6309
if (!KeyEvent::IsModifierKey(vkey) && keyDown)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

... LOL.

{
TrySnapOnInput();
}
Expand Down Expand Up @@ -529,12 +525,6 @@ bool Terminal::SendCharEvent(const wchar_t ch, const WORD scanCode, const Contro
vkey = _VirtualKeyFromCharacter(ch);
}

// GH#6481 - only snap on input for characters and keys like the arrow keys
// (which are handled in SendKeyEvent)
if (!KeyEvent::IsModifierKey(vkey))
{
TrySnapOnInput();
}
// Unfortunately, the UI doesn't give us both a character down and a
// character up event, only a character received event. So fake sending both
// to the terminal input translator. Unless it's in win32-input-mode, it'll
Expand Down