up 7.9.2

Thanks to https://github.com/irihitech/Ursa.Avalonia

v2rayN/Directory.Build.props

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

v2rayN/ServiceLib/Services/CoreConfig/CoreConfigSingboxService.cs

@@ -1324,7 +1324,7 @@ namespace ServiceLib.Services.CoreConfig
                 singboxConfig.experimental.cache_file = new CacheFile4Sbox()
                 {
                     enabled = true,
-                    path = Utils.GetBinConfigPath("cache.db")
+                    path = Utils.GetBinPath("cache.db")
                 };
             }
 

v2rayN/v2rayN.Desktop/App.axaml

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

v2rayN/v2rayN.Desktop/Controls/AutoCompleteBox.axaml

@@ -0,0 +1,48 @@
+<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

@@ -0,0 +1,38 @@
+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/MainWindow.axaml.cs

@@ -414,18 +414,17 @@ namespace v2rayN.Desktop.Views
             }
             else
             {
-                if (Utils.IsOSX() || _config.UiItem.Hide2TrayWhenClose)
-                {
-                    foreach (var ownedWindow in this.OwnedWindows)
-                    {
-                        ownedWindow.Close();
-                    }
-                    this.Hide();
-                }
-                else
+                if (Utils.IsLinux() && _config.UiItem.Hide2TrayWhenClose == false)
                 {
                     this.WindowState = WindowState.Minimized;
+                    return;
                 }
+
+                foreach (var ownedWindow in this.OwnedWindows)
+                {
+                    ownedWindow.Close();
+                }
+                this.Hide();
             }
 
             _config.UiItem.ShowInTaskbar = bl;

v2rayN/v2rayN.Desktop/Views/OptionSettingWindow.axaml

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

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

@@ -74,18 +74,11 @@ namespace v2rayN.Desktop.Views
             {
                 cmbSpeedTestTimeout.Items.Add(i * 5);
             }
-            Global.SpeedTestUrls.ForEach(it =>
-            {
-                cmbSpeedTestUrl.Items.Add(it);
-            });
-            Global.SpeedPingTestUrls.ForEach(it =>
-            {
-                cmbSpeedPingTestUrl.Items.Add(it);
-            });
-            Global.SubConvertUrls.ForEach(it =>
-            {
-                cmbSubConvertUrl.Items.Add(it);
-            });
+
+            cmbSpeedTestUrl.ItemsSource = Global.SpeedTestUrls;
+            cmbSpeedPingTestUrl.ItemsSource = Global.SpeedPingTestUrls;
+            cmbSubConvertUrl.ItemsSource = Global.SubConvertUrls;
+
             Global.GeoFilesSources.ForEach(it =>
             {
                 cmbGetFilesSourceUrl.Items.Add(it);
@@ -139,12 +132,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.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.CurrentFontFamily, v => v.cmbcurrentFontFamily.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.SpeedTestTimeout, v => v.cmbSpeedTestTimeout.SelectedValue).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.SpeedTestUrl, v => v.cmbSpeedTestUrl.Text).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SpeedPingTestUrl, v => v.cmbSpeedPingTestUrl.Text).DisposeWith(disposables);
                 this.Bind(ViewModel, vm => vm.MixedConcurrencyCount, v => v.cmbMixedConcurrencyCount.SelectedValue).DisposeWith(disposables);
-                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.SelectedValue).DisposeWith(disposables);
+                this.Bind(ViewModel, vm => vm.SubConvertUrl, v => v.cmbSubConvertUrl.Text).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);
@@ -174,15 +167,27 @@ namespace v2rayN.Desktop.Views
             if (Utils.IsWindows())
             {
                 txbSettingsExceptionTip2.IsVisible = false;
+
                 txtLinuxSudoPassword.IsVisible = false;
                 labLinuxSudoPassword.IsVisible = false;
                 labLinuxSudoPasswordTip.IsVisible = false;
+
+                labHide2TrayWhenClose.IsVisible = false;
+                togHide2TrayWhenClose.IsVisible = false;
             }
-            else
+            else if (Utils.IsLinux())
             {
                 txbSettingsExceptionTip.IsVisible = false;
                 panSystemProxyAdvanced.IsVisible = false;
             }
+            else if (Utils.IsOSX())
+            {
+                txbSettingsExceptionTip.IsVisible = false;
+                panSystemProxyAdvanced.IsVisible = false;
+
+                labHide2TrayWhenClose.IsVisible = false;
+                togHide2TrayWhenClose.IsVisible = false;
+            }
         }
 
         private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)
@@ -203,8 +208,9 @@ namespace v2rayN.Desktop.Views
         private async Task InitSettingFont()
         {
             var lstFonts = await GetFonts();
-            lstFonts.ForEach(it => { cmbcurrentFontFamily.Items.Add(it); });
-            cmbcurrentFontFamily.Items.Add(string.Empty);
+
+            lstFonts.Add(string.Empty);
+            cmbcurrentFontFamily.ItemsSource = lstFonts;
         }
 
         private async Task<List<string>> GetFonts()

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml

@@ -84,10 +84,12 @@
             <DataGrid
                 x:Name="lstProfiles"
                 AutoGenerateColumns="False"
+                CanUserReorderColumns="True"
                 BorderThickness="1"
                 CanUserResizeColumns="True"
                 GridLinesVisibility="All"
                 HeadersVisibility="All"
+                ScrollViewer.AllowAutoHide="False"
                 IsReadOnly="True"
                 ItemsSource="{Binding ProfileItems}">
                 <DataGrid.KeyBindings>

v2rayN/v2rayN.Desktop/Views/ProfilesView.axaml.cs

@@ -372,9 +372,8 @@ namespace v2rayN.Desktop.Views
         private void StorageUI(string? n = null)
         {
             List<ColumnItem> lvColumnItem = new();
-            for (int k = 0; k < lstProfiles.Columns.Count; k++)
+            foreach (var item2 in lstProfiles.Columns)
             {
-                var item2 = lstProfiles.Columns[k];
                 if (item2.Tag == null)
                 {
                     continue;

v2rayN/v2rayN/Views/OptionSettingWindow.xaml

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

v2rayN/v2rayN/Views/ProfilesView.xaml.cs

@@ -353,9 +353,9 @@ namespace v2rayN.Views
         private void StorageUI(string? n = null)
         {
             List<ColumnItem> lvColumnItem = new();
-            for (int k = 0; k < lstProfiles.Columns.Count; k++)
+            foreach (var t in lstProfiles.Columns)
             {
-                var item2 = (MyDGTextColumn)lstProfiles.Columns[k];
+                var item2 = (MyDGTextColumn)t;
                 lvColumnItem.Add(new()
                 {
                     Name = item2.ExName,