Merge branch 'v2_develop' into v2_3338-Toplevel-Must-Be-Disposed

This commit is contained in:
Tig
2024-03-21 07:56:09 -07:00
committed by GitHub
2 changed files with 17 additions and 4 deletions

View File

@@ -88,11 +88,11 @@ public enum MouseFlags
/// <summary>Vertical button wheeled down.</summary>
WheeledDown = 0x20000000,
/// <summary>Vertical button wheeled up while pressing ButtonShift.</summary>
WheeledLeft = ButtonShift | WheeledUp,
/// <summary>Vertical button wheeled up while pressing ButtonCtrl.</summary>
WheeledLeft = ButtonCtrl | WheeledUp,
/// <summary>Vertical button wheeled down while pressing ButtonShift.</summary>
WheeledRight = ButtonShift | WheeledDown,
/// <summary>Vertical button wheeled down while pressing ButtonCtrl.</summary>
WheeledRight = ButtonCtrl | WheeledDown,
/// <summary>Mask that captures all the events.</summary>
AllEvents = 0x7ffffff

View File

@@ -79,4 +79,17 @@ public class MouseTests (ITestOutputHelper output)
Assert.Equal (expectedMoved, new Point (5, 5) == testView.Frame.Location);
}
[Theory]
[InlineData (MouseFlags.WheeledUp | MouseFlags.ButtonCtrl, MouseFlags.WheeledLeft)]
[InlineData (MouseFlags.WheeledDown | MouseFlags.ButtonCtrl, MouseFlags.WheeledRight)]
public void WheeledLeft_WheeledRight (MouseFlags mouseFlags, MouseFlags expectedMouseFlagsFromEvent)
{
MouseFlags mouseFlagsFromEvent = MouseFlags.None;
var view = new View ();
view.MouseEvent += (s, e) => mouseFlagsFromEvent = e.MouseEvent.Flags;
view.OnMouseEvent (new MouseEvent () { Flags = mouseFlags });
Assert.Equal (mouseFlagsFromEvent, expectedMouseFlagsFromEvent);
}
}