v2rayN/Directory.Build.props

@@ -1,7 +1,7 @@
 <Project>
 
     <PropertyGroup>
-        <Version>7.9.2</Version>
+        <Version>7.9.1</Version>
     </PropertyGroup>
 
     <PropertyGroup>

v2rayN/v2rayN.Desktop/App.axaml

@@ -19,7 +19,6 @@
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
                 <ResourceInclude Source="Assets/GlobalResources.axaml" />
-                <ResourceInclude Source="Controls/AutoCompleteBox.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml

@@ -1,48 +0,0 @@
-<ResourceDictionary
-    xmlns="https://github.com/avaloniaui"
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:controls="clr-namespace:v2rayN.Desktop.Controls">
-    <!--  Add Resources Here  -->
-    <ControlTheme x:Key="{x:Type controls:AutoCompleteBox}" TargetType="controls:AutoCompleteBox">
-        <Setter Property="VerticalAlignment" Value="Center" />
-        <Setter Property="MinHeight" Value="{DynamicResource AutoCompleteBoxDefaultHeight}" />
-        <Setter Property="MaxDropDownHeight" Value="{DynamicResource AutoCompleteMaxDropdownHeight}" />
-        <Setter Property="Template">
-            <ControlTemplate TargetType="AutoCompleteBox">
-                <Panel>
-                    <TextBox
-                        Name="PART_TextBox"
-                        MinHeight="{TemplateBinding MinHeight}"
-                        VerticalAlignment="Stretch"
-                        DataValidationErrors.Errors="{TemplateBinding (DataValidationErrors.Errors)}"
-                        InnerLeftContent="{TemplateBinding InnerLeftContent}"
-                        InnerRightContent="{TemplateBinding InnerRightContent}"
-                        Watermark="{TemplateBinding Watermark}" />
-                    <Popup
-                        Name="PART_Popup"
-                        MaxHeight="{TemplateBinding MaxDropDownHeight}"
-                        IsLightDismissEnabled="True"
-                        PlacementTarget="{TemplateBinding}">
-                        <Border
-                            MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
-                            Margin="{DynamicResource AutoCompleteBoxPopupMargin}"
-                            Padding="{DynamicResource AutoCompleteBoxPopupPadding}"
-                            HorizontalAlignment="Stretch"
-                            Background="{DynamicResource AutoCompleteBoxPopupBackground}"
-                            BorderBrush="{DynamicResource AutoCompleteBoxPopupBorderBrush}"
-                            BorderThickness="{DynamicResource AutoCompleteBoxPopupBorderThickness}"
-                            BoxShadow="{DynamicResource AutoCompleteBoxPopupBoxShadow}"
-                            CornerRadius="{DynamicResource AutoCompleteBoxPopupCornerRadius}">
-                            <ListBox
-                                Name="PART_SelectingItemsControl"
-                                Foreground="{TemplateBinding Foreground}"
-                                ItemTemplate="{TemplateBinding ItemTemplate}"
-                                ScrollViewer.HorizontalScrollBarVisibility="Auto"
-                                ScrollViewer.VerticalScrollBarVisibility="Auto" />
-                        </Border>
-                    </Popup>
-                </Panel>
-            </ControlTemplate>
-        </Setter>
-    </ControlTheme>
-</ResourceDictionary>

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.cs

@@ -1,38 +0,0 @@
-using Avalonia.Input;
-using Avalonia.Interactivity;
-
-namespace v2rayN.Desktop.Controls;
-
-public class AutoCompleteBox : Avalonia.Controls.AutoCompleteBox
-{
-    static AutoCompleteBox()
-    {
-        MinimumPrefixLengthProperty.OverrideDefaultValue<AutoCompleteBox>(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);
-    }
-}

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"
@@ -220,7 +219,8 @@
                             Grid.Row="13"
                             Grid.Column="1"
                             Width="200"
-                            Classes="Margin8" />
+                            Classes="Margin8"
+                            ToolTip.Tip="Level" />
 
                         <TextBlock
                             Grid.Row="14"
@@ -505,12 +505,13 @@
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsCurrentFontFamily}" />
-                        <ctrls:AutoCompleteBox
+                        <ComboBox
                             x:Name="cmbcurrentFontFamily"
                             Grid.Row="15"
                             Grid.Column="1"
-                            Width="300"
-                            Classes="Margin8" />
+                            Width="200"
+                            Classes="Margin8"
+                            MaxDropDownHeight="1000" />
                         <TextBlock
                             Grid.Row="15"
                             Grid.Column="2"
@@ -551,8 +552,8 @@
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedTestUrl}" />
-                        <ctrls:AutoCompleteBox
-                            Name="cmbSpeedTestUrl"
+                        <ComboBox
+                            x:Name="cmbSpeedTestUrl"
                             Grid.Row="18"
                             Grid.Column="1"
                             Width="300"
@@ -564,7 +565,7 @@
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsSpeedPingTestUrl}" />
-                        <ctrls:AutoCompleteBox
+                        <ComboBox
                             x:Name="cmbSpeedPingTestUrl"
                             Grid.Row="19"
                             Grid.Column="1"
@@ -577,12 +578,13 @@
                             VerticalAlignment="Center"
                             Classes="Margin8"
                             Text="{x:Static resx:ResUI.TbSettingsSubConvert}" />
-                        <ctrls:AutoCompleteBox
+                        <ComboBox
                             x:Name="cmbSubConvertUrl"
                             Grid.Row="20"
                             Grid.Column="1"
                             Width="300"
-                            Classes="Margin8" />
+                            Classes="Margin8"
+                            ToolTip.Tip="Convert Url" />
 
                         <TextBlock
                             Grid.Row="21"
@@ -594,7 +596,7 @@
                             x:Name="cmbMainGirdOrientation"
                             Grid.Row="21"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Classes="Margin8" />
 
                         <TextBlock
@@ -685,7 +687,8 @@
                             <ComboBox
                                 x:Name="cmbsystemProxyAdvancedProtocol"
                                 MinWidth="400"
-                                Classes="Margin8" />
+                                Classes="Margin8"
+                                ToolTip.Tip="Protocol" />
                         </StackPanel>
                     </StackPanel>
 

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml.cs

@@ -74,11 +74,18 @@ namespace v2rayN.Desktop.Views
             {
                 cmbSpeedTestTimeout.Items.Add(i * 5);
             }
-
-            cmbSpeedTestUrl.ItemsSource = Global.SpeedTestUrls;
-            cmbSpeedPingTestUrl.ItemsSource = Global.SpeedPingTestUrls;
-            cmbSubConvertUrl.ItemsSource = Global.SubConvertUrls;
-
+            Global.SpeedTestUrls.ForEach(it =>
+            {
+                cmbSpeedTestUrl.Items.Add(it);
+            });
+            Global.SpeedPingTestUrls.ForEach(it =>
+            {
+                cmbSpeedPingTestUrl.Items.Add(it);
+            });
+            Global.SubConvertUrls.ForEach(it =>
+            {
+                cmbSubConvertUrl.Items.Add(it);
+            });
             Global.GeoFilesSources.ForEach(it =>
             {
                 cmbGetFilesSourceUrl.Items.Add(it);
@@ -132,12 +139,12 @@ namespace v2rayN.Desktop.Views
                 this.Bind(ViewModel, vm => vm.Hide2TrayWhenClose, v => v.togHide2TrayWhenClose.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.DoubleClick2Activate, v => v.togDoubleClick2Activate.IsChecked).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.AutoUpdateInterval, v => v.txtautoUpdateInterval.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.CurrentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentFontFamily, v => v.cmbcurrentFontFamily.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedTestUrl, v => v.cmbSpeedTestUrl.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MixedConcurrencyCount, v => v.cmbMixedConcurrencyCount.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MainGirdOrientation, v => v.cmbMainGirdOrientation.SelectedIndex).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.GeoFileSourceUrl, v => v.cmbGetFilesSourceUrl.SelectedValue).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SrsFileSourceUrl, v => v.cmbSrsFilesSourceUrl.SelectedValue).DisposeWith(disposables);
@@ -208,9 +215,8 @@ namespace v2rayN.Desktop.Views
         private async Task InitSettingFont()
         {
             var lstFonts = await GetFonts();
-
-            lstFonts.Add(string.Empty);
-            cmbcurrentFontFamily.ItemsSource = lstFonts;
+            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
+            cmbcurrentFontFamily.Items.Add(string.Empty);
         }
 
         private async Task<List<string>> GetFonts()

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -89,7 +89,6 @@
                 CanUserResizeColumns="True"
                 GridLinesVisibility="All"
                 HeadersVisibility="All"
-                ScrollViewer.AllowAutoHide="False"
                 IsReadOnly="True"
                 ItemsSource="{Binding ProfileItems}">
                 <DataGrid.KeyBindings>

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

@@ -764,7 +764,7 @@
                             x:Name="cmbcurrentFontFamily"
                             Grid.Row="15"
                             Grid.Column="1"
-                            Width="300"
+                            Width="200"
                             Margin="{StaticResource Margin8}"
                             MaxDropDownHeight="1000"
                             Style="{StaticResource DefComboBox}" />
@@ -867,7 +867,7 @@
                             x:Name="cmbMainGirdOrientation"
                             Grid.Row="21"
                             Grid.Column="1"
-                            Width="200"
+                            Width="300"
                             Margin="{StaticResource Margin8}"
                             Style="{StaticResource DefComboBox}" />