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 mouse coordinates when viewport is scrolled #10642

Merged
11 commits merged into from
Jul 20, 2021
Merged

Fix mouse coordinates when viewport is scrolled #10642

Changes from 3 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
ecacf2b
adjust sent coord
PankajBhojwani Jul 12, 2021
7f97dfd
ignore clicks outside active region
PankajBhojwani Jul 14, 2021
3e38fb2
readability
PankajBhojwani Jul 14, 2021
9867c88
fix
PankajBhojwani Jul 15, 2021
b4e1aea
has
PankajBhojwani Jul 16, 2021
52a19da
test
PankajBhojwani Jul 16, 2021
a7ce069
dont need nomousedown
PankajBhojwani Jul 16, 2021
02f9aa3
Merge branch 'main' of https://github.com/microsoft/terminal into dev…
PankajBhojwani Jul 16, 2021
a2892f0
Merge branch 'dev/pabhoj/mouse_viewport_fix' of https://github.com/mi…
PankajBhojwani Jul 19, 2021
8976a22
conflict
PankajBhojwani Jul 19, 2021
677b5d2
fix tests
PankajBhojwani Jul 19, 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
7 changes: 6 additions & 1 deletion src/cascadia/TerminalControl/ControlInteractivity.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -182,7 +182,12 @@ namespace winrt::Microsoft::Terminal::Control::implementation
}
else if (_canSendVTMouseInput(modifiers))
{
_core->SendMouseEvent(terminalPosition, pointerUpdateKind, modifiers, 0, buttonState);
const auto adjustment = _core->ScrollOffset() > 0 ? _core->BufferHeight() - _core->ScrollOffset() - _core->ViewHeight() : 0;
Copy link
Member

Choose a reason for hiding this comment

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

I'm surprised we don't already have a thing that calculates "how far back from the top line are we scrolled"... hmm.

// If the click happened outside the active region, just don't send any mouse event
if (const auto adjustedY = terminalPosition.y() - adjustment; adjustedY >= 0)
{
_core->SendMouseEvent({ terminalPosition.x(), adjustedY }, pointerUpdateKind, modifiers, 0, buttonState);
}
}
else if (buttonState.isLeftButtonDown)
{
Expand Down