github
/
v2rayN
mirror of https://github.com/2dust/v2rayN
1
0
Fork 0
Code Issues Releases Wiki Activity

bug fixes

pull/3492/head^2
2dust 2023-03-05 19:51:26 +08:00
parent 6fb17a4b74
commit 046ac95dc3
3 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
View File

@ -69,6 +69,8 @@ namespace v2rayN.ViewModels
public ComboItem SelectedServer { get; set; } public ComboItem SelectedServer { get; set; }
[Reactive] [Reactive]
public string ServerFilter { get; set; } public string ServerFilter { get; set; }
[Reactive]
public bool BlServers { get; set; }
#endregion #endregion
#region Menu #region Menu
@ -787,9 +789,11 @@ namespace v2rayN.ViewModels
_servers.Clear(); _servers.Clear();
if (_lstProfile.Count > _config.guiItem.trayMenuServersLimit) if (_lstProfile.Count > _config.guiItem.trayMenuServersLimit)
{ {
BlServers = false;
return; return;
} }
BlServers = true;
for (int k = 0; k < _lstProfile.Count; k++) for (int k = 0; k < _lstProfile.Count; k++)
{ {
ProfileItem it = _lstProfile[k]; ProfileItem it = _lstProfile[k];

14
v2rayN/v2rayN/Views/MainWindow.xaml
View File

@ -833,17 +833,17 @@
</tb:TaskbarIcon.ContextMenu> </tb:TaskbarIcon.ContextMenu>
<tb:TaskbarIcon.TrayToolTip> <tb:TaskbarIcon.TrayToolTip>
<Border <Border
Background="White"
BorderBrush="Black"
BorderThickness="2"
CornerRadius="2"
Width="Auto" Width="Auto"
Height="Auto"> Height="Auto"
Background="{DynamicResource MaterialDesignLightBackground}"
BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
BorderThickness="1">
<TextBlock <TextBlock
Margin="2" Margin="2"
Text="{Binding Mode=OneWay, Path=ToolTipText}"
HorizontalAlignment="Center" HorizontalAlignment="Center"
VerticalAlignment="Center" /> VerticalAlignment="Center"
Foreground="{DynamicResource MaterialDesignDarkBackground}"
Text="{Binding Mode=OneWay, Path=ToolTipText}" />
</Border> </Border>
</tb:TaskbarIcon.TrayToolTip> </tb:TaskbarIcon.TrayToolTip>
</tb:TaskbarIcon> </tb:TaskbarIcon>

1
v2rayN/v2rayN/Views/MainWindow.xaml.cs
View File

@ -150,6 +150,7 @@ namespace v2rayN.Views
this.OneWayBind(ViewModel, vm => vm.Servers, v => v.cmbServers.ItemsSource).DisposeWith(disposables); 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.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 //tray menu
this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard2).DisposeWith(disposables); this.BindCommand(ViewModel, vm => vm.AddServerViaClipboardCmd, v => v.menuAddServerViaClipboard2).DisposeWith(disposables);