Compare commits

..

No commits in common. "838bd2c794dd9bd4c92d01bfb8e467e9d8ab8f1a" and "0c758a7fdc47ed035e86224fc96d213f32956640" have entirely different histories.

5 changed files with 15 additions and 7 deletions

View file

@ -76,7 +76,7 @@
public const int MaxPort = 65536; public const int MaxPort = 65536;
public const string DelayUnit = ""; public const string DelayUnit = "";
public const string SpeedUnit = ""; public const string SpeedUnit = "";
public const int MinFontSize = 8; public const int MinFontSize = 10;
public const string RebootAs = "rebootas"; public const string RebootAs = "rebootas";
public const string AvaAssets = "avares://v2rayN/Assets/"; public const string AvaAssets = "avares://v2rayN/Assets/";

View file

@ -4,7 +4,7 @@
<TargetFramework>net8.0</TargetFramework> <TargetFramework>net8.0</TargetFramework>
<ImplicitUsings>enable</ImplicitUsings> <ImplicitUsings>enable</ImplicitUsings>
<Nullable>enable</Nullable> <Nullable>enable</Nullable>
<Version>7.4.1</Version> <Version>7.4.0</Version>
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>

View file

@ -105,7 +105,7 @@
<DataTemplate> <DataTemplate>
<Border <Border
Width="160" Width="160"
Margin="-6" Margin="0"
Padding="0" Padding="0"
Theme="{StaticResource CardBorder}"> Theme="{StaticResource CardBorder}">
<DockPanel> <DockPanel>
@ -143,12 +143,13 @@
<DataTemplate> <DataTemplate>
<Border <Border
Width="160" Width="160"
Margin="-6" Margin="0"
Padding="0" Padding="0"
Theme="{StaticResource CardBorder}"> Theme="{StaticResource CardBorder}">
<DockPanel> <DockPanel>
<Border <Border
Width="5" Width="5"
Height="30"
Margin="0,1" Margin="0,1"
Background="YellowGreen" Background="YellowGreen"
CornerRadius="4" CornerRadius="4"

View file

@ -353,7 +353,10 @@ namespace v2rayN.Desktop.Views
} }
if (item.Name.ToLower().StartsWith("to")) if (item.Name.ToLower().StartsWith("to"))
{ {
item2.IsVisible = _config.GuiItem.EnableStatistics; if (!_config.GuiItem.EnableStatistics)
{
item2.IsVisible = false;
}
} }
} }
} }

View file

@ -1,6 +1,7 @@
using MaterialDesignThemes.Wpf; using MaterialDesignThemes.Wpf;
using ReactiveUI; using ReactiveUI;
using Splat; using Splat;
using System;
using System.Reactive.Disposables; using System.Reactive.Disposables;
using System.Windows; using System.Windows;
using System.Windows.Controls; using System.Windows.Controls;
@ -341,7 +342,10 @@ namespace v2rayN.Views
} }
if (item.Name.ToLower().StartsWith("to")) if (item.Name.ToLower().StartsWith("to"))
{ {
item2.Visibility = _config.GuiItem.EnableStatistics ? Visibility.Visible : Visibility.Hidden; if (!_config.GuiItem.EnableStatistics)
{
item2.Visibility = Visibility.Hidden;
}
} }
} }
} }