diff --git a/v2rayN/v2rayN.Desktop/App.axaml b/v2rayN/v2rayN.Desktop/App.axaml index 222ab488..37c54471 100644 --- a/v2rayN/v2rayN.Desktop/App.axaml +++ b/v2rayN/v2rayN.Desktop/App.axaml @@ -20,7 +20,6 @@ - diff --git a/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml b/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml deleted file mode 100644 index 97fec908..00000000 --- a/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml +++ /dev/null @@ -1,48 +0,0 @@ - - - - - - - - - - - - - - - - - - - - diff --git a/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs b/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs deleted file mode 100644 index 82e04d4b..00000000 --- a/v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs +++ /dev/null @@ -1,40 +0,0 @@ -using Avalonia.Input; -using Avalonia.Interactivity; - -namespace v2rayN.Desktop.Controls; - -public class AutoCompleteBox : Avalonia.Controls.AutoCompleteBox -{ - static AutoCompleteBox() - { - MinimumPrefixLengthProperty.OverrideDefaultValue(0); - } - - public AutoCompleteBox() - { - AddHandler(PointerPressedEvent, OnBoxPointerPressed, RoutingStrategies.Tunnel); - } - - private void OnBoxPointerPressed(object? sender, PointerPressedEventArgs e) - { - if (Equals(sender, this) && e.GetCurrentPoint(this).Properties.IsLeftButtonPressed) - { - SetCurrentValue(IsDropDownOpenProperty, true); - } - } - - protected override void OnGotFocus(GotFocusEventArgs e) - { - base.OnGotFocus(e); - if (IsDropDownOpen) - { - return; - } - SetCurrentValue(IsDropDownOpenProperty, true); - } - - public void Clear() - { - SetCurrentValue(SelectedItemProperty, null); - } -} diff --git a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml index f8fc1ec0..b5e0a015 100644 --- a/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/DNSSettingWindow.axaml @@ -2,7 +2,6 @@ x:Class="v2rayN.Desktop.Views.DNSSettingWindow" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:ctrls="clr-namespace:v2rayN.Desktop.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib" diff --git a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml index e8d870bf..727f96a0 100644 --- a/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml +++ b/v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml @@ -2,7 +2,6 @@ x:Class="v2rayN.Desktop.Views.OptionSettingWindow" xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" - xmlns:ctrls="clr-namespace:v2rayN.Desktop.Controls" xmlns:d="http://schemas.microsoft.com/expression/blend/2008" xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" xmlns:resx="clr-namespace:ServiceLib.Resx;assembly=ServiceLib" @@ -622,7 +621,8 @@ Grid.Row="23" Grid.Column="1" Width="300" - Margin="{StaticResource Margin4}" /> + Margin="{StaticResource Margin4}" + IsEditable="True" /> + Margin="{StaticResource Margin4}" + IsEditable="True" /> + Margin="{StaticResource Margin4}" + IsEditable="True" />