chuan/Ursa.Avalonia
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Fix NavMenu selection on right-click (#819)

Browse Source 
* Initial plan

* Fix NavMenu right-click behavior - prevent selection on right-click

Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>

---------

Co-authored-by: copilot-swe-agent[bot] <198982749+Copilot@users.noreply.github.com>
Co-authored-by: rabbitism <14807942+rabbitism@users.noreply.github.com>
This commit is contained in:
Copilot
2025-11-12 15:33:18 +08:00
committed by GitHub
parent f9729859fe
commit 0ab084b198
2 changed files with 42 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/Ursa/Controls/NavMenu/NavMenuItem.cs
View File

@@ -308,8 +308,7 @@ public class NavMenuItem : HeaderedItemsControl
if (e.Handled) return;
var p = e.GetCurrentPoint(this);
if (p.Properties.PointerUpdateKind is not (PointerUpdateKind.LeftButtonPressed
or PointerUpdateKind.RightButtonPressed)) return;
if (p.Properties.PointerUpdateKind is not PointerUpdateKind.LeftButtonPressed) return;
if (p.Pointer.Type == PointerType.Mouse)
ActivateMenuItem(e);
@@ -325,7 +324,7 @@ public class NavMenuItem : HeaderedItemsControl
_isPointerDown = false;
if (e.InitialPressMouseButton is MouseButton.Left or MouseButton.Right)
if (e.InitialPressMouseButton is MouseButton.Left)
{
var point = e.GetCurrentPoint(this);
if (new Rect(Bounds.Size).ContainsExclusive(point.Position) && e.Pointer.Type == PointerType.Touch)

40
tests/HeadlessTest.Ursa/Controls/NavMenuTests/CanSelectTests/Test.cs
View File

@@ -100,4 +100,44 @@ public class Test
window.MouseUp(new Point(point3.Value.X+10, point3.Value.Y+10), Avalonia.Input.MouseButton.Left);
Assert.Equal(item3.DataContext, menu.SelectedItem); // Should change selection to item3
}
[AvaloniaFact]
public void RightClick_Does_Not_Change_Selection()
{
Window window = new Window
{
Width = 400,
Height = 400,
};
var view = new TestView1();
window.Content = view;
window.Show();
var menu = view.FindControl<NavMenu>("Menu");
var item1 = view.FindControl<NavMenuItem>("MenuItem1");
var item3 = view.FindControl<NavMenuItem>("MenuItem3");
Assert.NotNull(menu);
Assert.NotNull(item1);
Assert.NotNull(item3);
var point1 = item1.TranslatePoint(new Point(0, 0), window);
var point3 = item3.TranslatePoint(new Point(0, 0), window);
Assert.NotNull(point1);
Assert.NotNull(point3);
// Left-click on item1 to select it
window.MouseDown(new Point(point1.Value.X+10, point1.Value.Y+10), Avalonia.Input.MouseButton.Left);
window.MouseUp(new Point(point1.Value.X+10, point1.Value.Y+10), Avalonia.Input.MouseButton.Left);
Assert.Equal(item1, menu.SelectedItem);
// Right-click on item3 - should NOT change selection
window.MouseDown(new Point(point3.Value.X+10, point3.Value.Y+10), Avalonia.Input.MouseButton.Right);
window.MouseUp(new Point(point3.Value.X+10, point3.Value.Y+10), Avalonia.Input.MouseButton.Right);
Assert.Equal(item1, menu.SelectedItem); // Selection should remain on item1
Assert.False(item3.IsSelected); // item3 should not be selected
}
}