Skip to content

Fixes #2014. Application mouseGrabView is run twice if return true. #2015

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

Merged
merged 2 commits into from
Sep 16, 2022
Merged

Fixes #2014. Application mouseGrabView is run twice if return true. #2015

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
18b2dec
Fixes #2014. Application mouseGrabView is run twice if return true.
BDisp Sep 15, 2022
e3d79b1
Sometimes I get fails with this unit test.
BDisp Sep 15, 2022
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: 2 additions & 5 deletions Terminal.Gui/Core/Application.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -656,11 +656,8 @@ static void ProcessMouseEvent (MouseEvent me)
lastMouseOwnerView?.OnMouseLeave (me);
}
// System.Diagnostics.Debug.WriteLine ($"{nme.Flags};{nme.X};{nme.Y};{mouseGrabView}");
if (mouseGrabView != null) {
mouseGrabView.OnMouseEvent (nme);
if (mouseGrabView != null) {
return;
}
if (mouseGrabView != null && mouseGrabView.OnMouseEvent (nme)) {
return;
}
}

Expand Down
4 changes: 2 additions & 2 deletions UnitTests/ApplicationTests.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1301,7 +1301,7 @@ public void TestAddManyTimeouts ()
var myi = i;

Task.Run (() => {
Task.Delay (100).Wait ();
Thread.Sleep (100);

// each thread registers lots of 1s timeouts
for (int j = 0; j < numberOfTimeoutsPerThread; j++) {
Expand All @@ -1318,7 +1318,7 @@ public void TestAddManyTimeouts ()
if (myi == 0) {

// let the timeouts run for a bit
Task.Delay (5000).Wait ();
Thread.Sleep (5000);

// then tell the application to quit
Application.MainLoop.Invoke (() => Application.RequestStop ());
Expand Down