Compare commits

..

No commits in common. "4e3e5ce130f274420a83e157fb5ec2cc2c93d46e" and "e0f005bd96df6be1f7ddf469292e0560037ed114" have entirely different histories.

7 changed files with 15 additions and 27 deletions

View file

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

View file

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

View file

@ -459,7 +459,6 @@
Classes="Margin8" /> Classes="Margin8" />
<TextBlock <TextBlock
x:Name="labHide2TrayWhenClose"
Grid.Row="9" Grid.Row="9"
Grid.Column="0" Grid.Column="0"
VerticalAlignment="Center" VerticalAlignment="Center"

View file

@ -174,27 +174,15 @@ namespace v2rayN.Desktop.Views
if (Utils.IsWindows()) if (Utils.IsWindows())
{ {
txbSettingsExceptionTip2.IsVisible = false; txbSettingsExceptionTip2.IsVisible = false;
txtLinuxSudoPassword.IsVisible = false; txtLinuxSudoPassword.IsVisible = false;
labLinuxSudoPassword.IsVisible = false; labLinuxSudoPassword.IsVisible = false;
labLinuxSudoPasswordTip.IsVisible = false; labLinuxSudoPasswordTip.IsVisible = false;
labHide2TrayWhenClose.IsVisible = false;
togHide2TrayWhenClose.IsVisible = false;
} }
else if (Utils.IsLinux()) else
{ {
txbSettingsExceptionTip.IsVisible = false; txbSettingsExceptionTip.IsVisible = false;
panSystemProxyAdvanced.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) private async Task<bool> UpdateViewHandler(EViewAction action, object? obj)

View file

@ -84,7 +84,6 @@
<DataGrid <DataGrid
x:Name="lstProfiles" x:Name="lstProfiles"
AutoGenerateColumns="False" AutoGenerateColumns="False"
CanUserReorderColumns="True"
BorderThickness="1" BorderThickness="1"
CanUserResizeColumns="True" CanUserResizeColumns="True"
GridLinesVisibility="All" GridLinesVisibility="All"

View file

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

View file

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