diff --git a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml index 81e4c6aa..221a1b88 100644 --- a/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/AddGroupServerWindow.axaml @@ -152,7 +152,10 @@ - + break; case Key.Delete: + case Key.Back: ViewModel?.ChildRemoveAsync(); e.Handled = true; break; diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml index 371ade2d..c84a7151 100644 --- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml +++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml @@ -115,7 +115,7 @@ + InputGesture="Back" /> diff --git a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs index 418d6d20..e019c5fd 100644 --- a/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs +++ b/v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs @@ -313,33 +313,37 @@ public partial class ProfilesView : ReactiveUserControl } else { - if (e.Key is Key.Enter or Key.Return) + switch (e.Key) { - ViewModel?.SetDefaultServer(); - } - else if (e.Key == Key.Delete) - { - ViewModel?.RemoveServerAsync(); - } - else if (e.Key == Key.T) - { - ViewModel?.MoveServer(EMove.Top); - } - else if (e.Key == Key.U) - { - ViewModel?.MoveServer(EMove.Up); - } - else if (e.Key == Key.D) - { - ViewModel?.MoveServer(EMove.Down); - } - else if (e.Key == Key.B) - { - ViewModel?.MoveServer(EMove.Bottom); - } - else if (e.Key == Key.Escape) - { - ViewModel?.ServerSpeedtestStop(); + case Key.Enter: + //case Key.Return: + ViewModel?.SetDefaultServer(); + break; + + case Key.Delete: + case Key.Back: + ViewModel?.RemoveServerAsync(); + break; + + case Key.T: + ViewModel?.MoveServer(EMove.Top); + break; + + case Key.U: + ViewModel?.MoveServer(EMove.Up); + break; + + case Key.D: + ViewModel?.MoveServer(EMove.Down); + break; + + case Key.B: + ViewModel?.MoveServer(EMove.Bottom); + break; + + case Key.Escape: + ViewModel?.ServerSpeedtestStop(); + break; } } } diff --git a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml index 8c84bc39..7d00b3cc 100644 --- a/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/RoutingRuleSettingWindow.axaml @@ -187,7 +187,7 @@ + InputGesture="Back" /> + InputGesture="Back" /> { if (e.KeyModifiers is KeyModifiers.Control or KeyModifiers.Meta) { - if (e.Key == Key.A) + switch (e.Key) { - lstRoutings.SelectAll(); + case Key.A: + lstRoutings.SelectAll(); + break; } } - else if (e.Key is Key.Enter or Key.Return) + else { - ViewModel?.RoutingAdvancedSetDefault(); - } - else if (e.Key == Key.Delete) - { - ViewModel?.RoutingAdvancedRemoveAsync(); + switch (e.Key) + { + case Key.Enter: + //case Key.Return: + ViewModel?.RoutingAdvancedSetDefault(); + break; + + case Key.Delete: + case Key.Back: + ViewModel?.RoutingAdvancedRemoveAsync(); + break; + } } } diff --git a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs index d7cf450c..14f5a7bf 100644 --- a/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/AddGroupServerWindow.xaml.cs @@ -91,25 +91,28 @@ public partial class AddGroupServerWindow } else { - if (e.Key == Key.T) + switch (e.Key) { - ViewModel?.MoveServer(EMove.Top); - } - else if (e.Key == Key.U) - { - ViewModel?.MoveServer(EMove.Up); - } - else if (e.Key == Key.D) - { - ViewModel?.MoveServer(EMove.Down); - } - else if (e.Key == Key.B) - { - ViewModel?.MoveServer(EMove.Bottom); - } - else if (e.Key == Key.Delete) - { - ViewModel?.ChildRemoveAsync(); + case Key.T: + ViewModel?.MoveServer(EMove.Top); + break; + + case Key.U: + ViewModel?.MoveServer(EMove.Up); + break; + + case Key.D: + ViewModel?.MoveServer(EMove.Down); + break; + + case Key.B: + ViewModel?.MoveServer(EMove.Bottom); + break; + + case Key.Delete: + case Key.Back: + ViewModel?.ChildRemoveAsync(); + break; } } } diff --git a/v2rayN/v2rayN/Views/ProfilesView.xaml b/v2rayN/v2rayN/Views/ProfilesView.xaml index 8bbfb6b7..6cf0d159 100644 --- a/v2rayN/v2rayN/Views/ProfilesView.xaml +++ b/v2rayN/v2rayN/Views/ProfilesView.xaml @@ -138,7 +138,7 @@ x:Name="menuRemoveServer" Height="{StaticResource MenuItemHeight}" Header="{x:Static resx:ResUI.menuRemoveServer}" - InputGestureText="Delete" /> + InputGestureText="Back" /> + InputGestureText="Back" /> + InputGestureText="Back" />