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

Fixes #3374 - Curses and Net drivers don't generate click events unless mouse has not moved #3375

Draft
wants to merge 1 commit into
base: v2_develop
Choose a base branch
from
Draft

Fixes #3374 - Curses and Net drivers don't generate click events unless mouse has not moved #3375

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
2 changes: 1 addition & 1 deletion Terminal.Gui/ConsoleDrivers/NetDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1137,7 +1137,7 @@ private void ProcessInput (InputResult inputEvent)
break;
case EventType.Mouse:
MouseEvent me = ToDriverMouse (inputEvent.MouseEvent);
//Debug.WriteLine ($"NetDriver: ({me.X},{me.Y}) - {me.Flags}");
Debug.WriteLine ($"NetDriver: ({me.X},{me.Y}) - {me.Flags}");
OnMouseEvent (new MouseEventEventArgs (me));

break;
Expand Down
22 changes: 13 additions & 9 deletions Terminal.Gui/ConsoleDrivers/WindowsDriver.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1393,18 +1393,20 @@ internal void ProcessInput (WindowsConsole.InputRecord inputEvent)
break;
}

Debug.WriteLine ($"WindowsDriver: ({me.X},{me.Y}) - {me.Flags}");

OnMouseEvent (new MouseEventEventArgs (me));

if (_processButtonClick)
{
OnMouseEvent (
new MouseEventEventArgs (
new MouseEvent
{
X = me.X,
Y = me.Y,
Flags = ProcessButtonClick (inputEvent.MouseEvent)
}));
me = new MouseEvent
{
X = me.X,
Y = me.Y,
Flags = ProcessButtonClick (inputEvent.MouseEvent)
};
Debug.WriteLine ($"WindowsDriver: 2 ({me.X},{me.Y}) - {me.Flags}");
OnMouseEvent (new MouseEventEventArgs (me));
}

break;
Expand Down Expand Up @@ -2011,12 +2013,14 @@ private MouseEvent ToDriverMouse (WindowsConsole.MouseEventRecord mouseEvent)
//System.Diagnostics.Debug.WriteLine (
// $"point.X:{(point is { } ? ((Point)point).X : -1)};point.Y:{(point is { } ? ((Point)point).Y : -1)}");

return new MouseEvent
var me = new MouseEvent
{
X = mouseEvent.MousePosition.X,
Y = mouseEvent.MousePosition.Y,
Flags = mouseFlag
};

return me;
}
}

Expand Down