diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs index 17bd0e3942..6bc927a9d4 100644 --- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs +++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs @@ -69,6 +69,8 @@ public class MainWindowViewModel : ReactiveObject public ComboItem SelectedServer { get; set; } [Reactive] public string ServerFilter { get; set; } + [Reactive] + public bool BlServers { get; set; } #endregion #region Menu @@ -787,9 +789,11 @@ private void RefreshServersMenu() _servers.Clear(); if (_lstProfile.Count > _config.guiItem.trayMenuServersLimit) { + BlServers = false; return; } + BlServers = true; for (int k = 0; k < _lstProfile.Count; k++) { ProfileItem it = _lstProfile[k]; diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml index c0d96e68b2..92ec420bd5 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml +++ b/v2rayN/v2rayN/Views/MainWindow.xaml @@ -833,17 +833,17 @@ + Height="Auto" + Background="{DynamicResource MaterialDesignLightBackground}" + BorderBrush="{DynamicResource MaterialDesignDarkBackground}" + BorderThickness="1"> + VerticalAlignment="Center" + Foreground="{DynamicResource MaterialDesignDarkBackground}" + Text="{Binding Mode=OneWay, Path=ToolTipText}" /> diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs index f477c5fd35..cdd4cf806d 100644 --- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs +++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs @@ -150,6 +150,7 @@ public MainWindow() this.OneWayBind(ViewModel, vm => vm.Servers, v => v.cmbServers.ItemsSource).DisposeWith(disposables); this.Bind(ViewModel, vm => vm.SelectedServer, v => v.cmbServers.SelectedItem).DisposeWith(disposables); + this.OneWayBind(ViewModel, vm => vm.BlServers, v => v.cmbServers.Visibility).DisposeWith(disposables); //tray menu this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard2).DisposeWith(disposables);