Fixed Application tests

This commit is contained in:
Tig
2024-10-06 10:14:14 -06:00
parent d2bad302c3
commit 3c3b4f85cd
3 changed files with 18 additions and 13 deletions

View File

@@ -42,13 +42,13 @@ public class ApplicationMouseTests
bool expectedClicked
)
{
var mouseEvent = new MouseEvent { Position = new (clickX, clickY), Flags = MouseFlags.Button1Pressed };
var mouseEvent = new MouseEvent { ScreenPosition = new (clickX, clickY), Flags = MouseFlags.Button1Pressed };
var clicked = false;
void OnApplicationOnMouseEvent (object s, MouseEvent e)
{
Assert.Equal (expectedX, e.Position.X);
Assert.Equal (expectedY, e.Position.Y);
Assert.Equal (expectedX, e.ScreenPosition.X);
Assert.Equal (expectedY, e.ScreenPosition.Y);
clicked = true;
}
@@ -116,7 +116,7 @@ public class ApplicationMouseTests
Height = size.Height
};
var mouseEvent = new MouseEvent { Position = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
var mouseEvent = new MouseEvent { ScreenPosition = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
view.MouseClick += (s, e) =>
{
@@ -218,7 +218,7 @@ public class ApplicationMouseTests
Application.Top.Add (view);
var mouseEvent = new MouseEvent { Position = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
var mouseEvent = new MouseEvent { ScreenPosition = new (clickX, clickY), Flags = MouseFlags.Button1Clicked };
view.MouseClick += (s, e) =>
{
@@ -261,7 +261,7 @@ public class ApplicationMouseTests
Assert.True (tf.HasFocus);
Assert.Null (Application.MouseGrabView);
Application.OnMouseEvent (new () { Position = new (5, 5), Flags = MouseFlags.ReportMousePosition });
Application.OnMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition });
Assert.Equal (sv, Application.MouseGrabView);
@@ -275,15 +275,15 @@ public class ApplicationMouseTests
// another toplevel (Dialog) was opened
Assert.Null (Application.MouseGrabView);
Application.OnMouseEvent (new () { Position = new (5, 5), Flags = MouseFlags.ReportMousePosition });
Application.OnMouseEvent (new () { ScreenPosition = new (5, 5), Flags = MouseFlags.ReportMousePosition });
Assert.Null (Application.MouseGrabView);
Application.OnMouseEvent (new () { Position = new (40, 12), Flags = MouseFlags.ReportMousePosition });
Application.OnMouseEvent (new () { ScreenPosition = new (40, 12), Flags = MouseFlags.ReportMousePosition });
Assert.Null (Application.MouseGrabView);
Application.OnMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Pressed });
Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed });
Assert.Null (Application.MouseGrabView);
@@ -402,7 +402,7 @@ public class ApplicationMouseTests
Assert.True (view.WasDisposed);
#endif
Application.OnMouseEvent (new () { Position = new (0, 0), Flags = MouseFlags.Button1Pressed });
Application.OnMouseEvent (new () { ScreenPosition = new (0, 0), Flags = MouseFlags.Button1Pressed });
Assert.Null (Application.MouseGrabView);
Assert.Equal (0, count);
top.Dispose ();