From b176ad03aa77421e545d702c595084e3ed6cc681 Mon Sep 17 00:00:00 2001
From: 2dust <31833384+2dust@users.noreply.github.com>
Date: Sun, 4 Jun 2023 16:30:42 +0800
Subject: [PATCH] Remove ToolTipText

---
 .../v2rayN/ViewModels/MainWindowViewModel.cs  | 16 ++++-----
 v2rayN/v2rayN/Views/MainWindow.xaml           | 33 +++++--------------
 v2rayN/v2rayN/Views/MainWindow.xaml.cs        |  4 +--
 3 files changed, 18 insertions(+), 35 deletions(-)

diff --git a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
index fa56d071..0e0a8d2f 100644
--- a/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
+++ b/v2rayN/v2rayN/ViewModels/MainWindowViewModel.cs
@@ -167,8 +167,8 @@ namespace v2rayN.ViewModels
         [Reactive]
         public ImageSource AppIcon { get; set; }
 
-        [Reactive]
-        public bool BlShowTrayTip { get; set; }
+        //[Reactive]
+        //public bool BlShowTrayTip { get; set; }
 
         #endregion Menu
 
@@ -210,8 +210,8 @@ namespace v2rayN.ViewModels
         [Reactive]
         public string RunningServerDisplay { get; set; }
 
-        [Reactive]
-        public string RunningServerToolTipText { get; set; }
+        //[Reactive]
+        //public string RunningServerToolTipText { get; set; }
 
         [Reactive]
         public string RunningInfoDisplay { get; set; }
@@ -849,12 +849,12 @@ namespace v2rayN.ViewModels
                 {
                     var runningSummary = running.GetSummary();
                     RunningServerDisplay = $"{ResUI.menuServers}:{runningSummary}";
-                    RunningServerToolTipText = runningSummary;
+                    //RunningServerToolTipText = runningSummary;
                 }
                 else
                 {
-                    RunningServerDisplay =
-                    RunningServerToolTipText = ResUI.CheckServerSettings;
+                    RunningServerDisplay = ResUI.CheckServerSettings;
+                    //RunningServerToolTipText = ResUI.CheckServerSettings;
                 }
             }));
         }
@@ -1686,7 +1686,7 @@ namespace v2rayN.ViewModels
             }
             CurrentFontSize = _config.uiItem.currentFontSize;
             CurrentLanguage = _config.uiItem.currentLanguage;
-            BlShowTrayTip = _config.uiItem.showTrayTip;
+            //BlShowTrayTip = _config.uiItem.showTrayTip;
 
             this.WhenAnyValue(
                   x => x.ColorModeDark,
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml b/v2rayN/v2rayN/Views/MainWindow.xaml
index 81495c84..412d55fb 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml
@@ -301,7 +301,7 @@
                                 <Grid>
                                     <Grid.RowDefinitions>
                                         <RowDefinition Height="Auto" />
-										<RowDefinition Height="Auto" />
+                                        <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
                                         <RowDefinition Height="Auto" />
@@ -323,13 +323,13 @@
                                         Margin="8"
                                         IsEnabled="{Binding ElementName=followSystemTheme, Path=IsChecked, Converter={StaticResource InverseBooleanConverter}}" />
 
-									<TextBlock
-	                                    Grid.Row="1"
-	                                    Grid.Column="0"
-	                                    VerticalAlignment="Center"
-	                                    Style="{StaticResource ToolbarTextBlock}"
-	                                    Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
-									<ToggleButton
+                                    <TextBlock
+                                        Grid.Row="1"
+                                        Grid.Column="0"
+                                        VerticalAlignment="Center"
+                                        Style="{StaticResource ToolbarTextBlock}"
+                                        Text="{x:Static resx:ResUI.TbSettingsFollowSystemTheme}" />
+                                    <ToggleButton
                                         x:Name="followSystemTheme"
                                         Grid.Row="1"
                                         Grid.Column="1"
@@ -856,23 +856,6 @@
                             Header="{x:Static resx:ResUI.menuExit}" />
                     </ContextMenu>
                 </tb:TaskbarIcon.ContextMenu>
-                <tb:TaskbarIcon.TrayToolTip>
-                    <Border
-                        x:Name="borTrayToolTip"
-                        Width="Auto"
-                        Height="Auto"
-                        Background="{DynamicResource MaterialDesignLightBackground}"
-                        BorderBrush="{DynamicResource MaterialDesignDarkBackground}"
-                        BorderThickness="0"
-                        CornerRadius="4">
-                        <TextBlock
-                            Margin="8"
-                            HorizontalAlignment="Center"
-                            VerticalAlignment="Center"
-                            Foreground="{DynamicResource MaterialDesignDarkBackground}"
-                            Text="{Binding Mode=OneWay, Path=ToolTipText}" />
-                    </Border>
-                </tb:TaskbarIcon.TrayToolTip>
             </tb:TaskbarIcon>
             <materialDesign:Snackbar x:Name="MainSnackbar" MessageQueue="{materialDesign:MessageQueue}" />
         </Grid>
diff --git a/v2rayN/v2rayN/Views/MainWindow.xaml.cs b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
index db5ca106..e38ff4dd 100644
--- a/v2rayN/v2rayN/Views/MainWindow.xaml.cs
+++ b/v2rayN/v2rayN/Views/MainWindow.xaml.cs
@@ -163,10 +163,10 @@ namespace v2rayN.Views
                 this.BindCommand(ViewModel, vm => vm.SubUpdateViaProxyCmd, v => v.menuSubUpdateViaProxy2).DisposeWith(disposables);
 
                 this.OneWayBind(ViewModel, vm => vm.NotifyIcon, v => v.tbNotify.Icon).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
+                //this.OneWayBind(ViewModel, vm => vm.RunningServerToolTipText, v => v.tbNotify.ToolTipText).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.NotifyLeftClickCmd, v => v.tbNotify.LeftClickCommand).DisposeWith(disposables);
                 this.OneWayBind(ViewModel, vm => vm.AppIcon, v => v.Icon).DisposeWith(disposables);
-                this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);
+                //this.OneWayBind(ViewModel, vm => vm.BlShowTrayTip, v => v.borTrayToolTip.Visibility).DisposeWith(disposables);
 
                 //status bar
                 this.OneWayBind(ViewModel, vm => vm.InboundDisplay, v => v.txtInboundDisplay.Text).DisposeWith(disposables);