From 6364f5f4d1b0fba26aa4b2d32679bed4b22b4563 Mon Sep 17 00:00:00 2001
From: XuShanQiXun <3401460572@qq.com>
Date: Sun, 8 Jun 2025 09:12:24 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E8=8F=9C=E5=8D=95=E6=A0=B7?=
 =?UTF-8?q?=E5=BC=8F=E5=92=8C=E5=BC=82=E6=AD=A5=E5=8A=A0=E8=BD=BD=E9=80=BB?=
 =?UTF-8?q?=E8=BE=91?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

在 `MaterialTrayMenuItem.xaml` 中添加命名空间，更新菜单项样式，增加悬停和点击动画效果，提升用户交互体验。新增上下文菜单样式，包含透明度和缩放动画。

在 `LoginWindow.xaml.cs` 中将 `Window_Loaded` 方法改为异步，增强窗口加载时的连接稳定性，并添加连接服务器的逻辑及错误处理。

在 `MainWindow.xaml` 中移除 `TextBox` 控件的 `Foreground` 属性设置，简化样式，保持界面整洁。
---
 chatclient/Data/MaterialTrayMenuItem.xaml | 135 ++++++++++++++++++++--
 chatclient/LoginWindow.xaml.cs            |  24 +++-
 chatclient/MainWindow.xaml                |   2 +-
 3 files changed, 145 insertions(+), 16 deletions(-)

diff --git a/chatclient/Data/MaterialTrayMenuItem.xaml b/chatclient/Data/MaterialTrayMenuItem.xaml
index 5387ae3..d7abe29 100644
--- a/chatclient/Data/MaterialTrayMenuItem.xaml
+++ b/chatclient/Data/MaterialTrayMenuItem.xaml
@@ -1,7 +1,12 @@
-<ResourceDictionary 
-             xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-             xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-             xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes">
+<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
+            xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+            xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+            xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+            xmlns:materialDesign="http://materialdesigninxaml.net/winfx/xaml/themes"
+            xmlns:local="clr-namespace:chatclient"
+            xmlns:mah="http://metro.mahapps.com/winfx/xaml/controls">
+    <!-- 动画缓动函数 -->
+    <CubicEase x:Key="MenuEase" EasingMode="EaseOut"/>
     <!-- Material Design 托盘菜单样式 -->
     <Style x:Key="MaterialTrayMenuItem" TargetType="MenuItem" BasedOn="{StaticResource MaterialDesignMenuItem}">
         <Setter Property="Background" Value="Transparent"/>
@@ -13,27 +18,81 @@
             <Setter.Value>
                 <ControlTemplate TargetType="MenuItem">
                     <Border x:Name="Border" 
-                            Background="Transparent"
                             CornerRadius="4"
-                            SnapsToDevicePixels="True">
+                            SnapsToDevicePixels="True"
+                            Background="Transparent">
                         <Grid>
-                            <materialDesign:Ripple Content="{TemplateBinding Header}" Background="Transparent" Foreground="{TemplateBinding Foreground}"
-                                                   HorizontalContentAlignment="Stretch" VerticalContentAlignment="Center" Padding="{TemplateBinding Padding}"/>
+                            <!-- 背景动画层 -->
+                            <Rectangle x:Name="HoverRect" 
+                                       Fill="#FF3D3D40" 
+                                       Opacity="0"
+                                       RadiusX="4" RadiusY="4"/>
+
+                            <!-- 涟漪效果层 -->
+                            <materialDesign:Ripple
+                                x:Name="Ripple"
+                                Foreground="{TemplateBinding Foreground}"
+                                Content="{TemplateBinding Header}"
+                                VerticalContentAlignment="Center" 
+                                Padding="{TemplateBinding Padding}"
+                                Background="Transparent" 
+                                HorizontalContentAlignment="Stretch"/>
                         </Grid>
                     </Border>
+
                     <ControlTemplate.Triggers>
-                        <Trigger Property="IsHighlighted" Value="True">
-                            <Setter TargetName="Border" Property="Background" Value="{DynamicResource MaterialDesignSelection}"/>
+                        <!-- 悬停动画 -->
+                        <Trigger Property="IsMouseOver" Value="True">
+                            <Trigger.EnterActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="HoverRect"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0.2"
+                                            Duration="0:0:0.2"
+                                            EasingFunction="{StaticResource MenuEase}"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.EnterActions>
+                            <Trigger.ExitActions>
+                                <BeginStoryboard>
+                                    <Storyboard>
+                                        <DoubleAnimation
+                                            Storyboard.TargetName="HoverRect"
+                                            Storyboard.TargetProperty="Opacity"
+                                            To="0"
+                                            Duration="0:0:0.3"
+                                            EasingFunction="{StaticResource MenuEase}"/>
+                                    </Storyboard>
+                                </BeginStoryboard>
+                            </Trigger.ExitActions>
                         </Trigger>
+
+                        <!-- 点击动画 -->
+                        <EventTrigger RoutedEvent="PreviewMouseDown">
+                            <BeginStoryboard>
+                                <Storyboard>
+                                    <DoubleAnimation
+                                        Storyboard.TargetName="Ripple"
+                                        Storyboard.TargetProperty="Opacity"
+                                        From="0.5" To="1"
+                                        Duration="0:0:0.15"/>
+                                </Storyboard>
+                            </BeginStoryboard>
+                        </EventTrigger>
                     </ControlTemplate.Triggers>
                 </ControlTemplate>
             </Setter.Value>
         </Setter>
     </Style>
+
+    <!-- 托盘菜单样式 -->
     <Style x:Key="MaterialTrayMenu" TargetType="ContextMenu">
+        <!--<Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}"/>-->
         <Setter Property="Background" Value="{DynamicResource MaterialDesignPaper}"/>
-        <Setter Property="BorderBrush" Value="{DynamicResource MaterialDesignDivider}"/>
-        <Setter Property="BorderThickness" Value="1"/>
+        <Setter Property="BorderBrush" Value="#A0252526"/>
+        <Setter Property="BorderThickness" Value="2"/>
         <Setter Property="Padding" Value="8"/>
         <Setter Property="SnapsToDevicePixels" Value="True"/>
         <Setter Property="Effect">
@@ -41,5 +100,57 @@
                 <DropShadowEffect BlurRadius="16" ShadowDepth="4" Color="#40000000"/>
             </Setter.Value>
         </Setter>
+        <Setter Property="RenderTransformOrigin" Value="0.5 0.5"/>
+        <Setter Property="RenderTransform">
+            <Setter.Value>
+                <ScaleTransform ScaleY="0.9"/>
+            </Setter.Value>
+        </Setter>
+        <Setter Property="Template">
+            <Setter.Value>
+                <ControlTemplate TargetType="ContextMenu">
+                    <Border x:Name="MenuBorder"
+                            Background="{TemplateBinding Background}"
+                            BorderBrush="{TemplateBinding BorderBrush}"
+                            BorderThickness="{TemplateBinding BorderThickness}"
+                            CornerRadius="4"
+                            Padding="{TemplateBinding Padding}">
+                        <ItemsPresenter/>
+                    </Border>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="IsOpen" Value="True">
+                <Trigger.EnterActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <!-- 透明度动画 -->
+                            <DoubleAnimation
+                                Storyboard.TargetProperty="Opacity"
+                                From="0" To="1"
+                                Duration="0:0:0.2"/>
+
+                            <!-- 仅保留缩放动画（无位移） -->
+                            <DoubleAnimation
+                                Storyboard.TargetProperty="RenderTransform.ScaleY"
+                                From="0.9" To="1"
+                                Duration="0:0:0.3"
+                                EasingFunction="{StaticResource MenuEase}"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.EnterActions>
+                <Trigger.ExitActions>
+                    <BeginStoryboard>
+                        <Storyboard>
+                            <DoubleAnimation
+                                Storyboard.TargetProperty="Opacity"
+                                To="0"
+                                Duration="0:0:0.15"/>
+                        </Storyboard>
+                    </BeginStoryboard>
+                </Trigger.ExitActions>
+            </Trigger>
+        </Style.Triggers>
     </Style>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/chatclient/LoginWindow.xaml.cs b/chatclient/LoginWindow.xaml.cs
index f28d3c6..b27f93a 100644
--- a/chatclient/LoginWindow.xaml.cs
+++ b/chatclient/LoginWindow.xaml.cs
@@ -277,10 +277,28 @@ namespace chatclient
                 }
             });
         }
-        public void Window_Loaded(object sender, RoutedEventArgs e)
+        public async void Window_Loaded(object sender, RoutedEventArgs e)
         {
             log.Info("登录窗口已加载");
-
+            if (MainWindow.Client?.Connected == false)
+            {
+                log.Info("未连接服务器，尝试连接");
+                // 异步连接操作
+                await Task.Run(() =>
+                {
+                    try
+                    {
+                        MainWindow.Client = new Socket(AddressFamily.InterNetwork, SocketType.Stream, ProtocolType.Tcp);
+                        MainWindow.Client?.Connect(IPAddress.Parse(Server.ServerIP), Server.ServerPort);
+                        MainWindow.StartReceive();
+                    }
+                    catch (Exception ex)
+                    {
+                        log.Error($"连接失败: {ex.Message}");
+                        MainWindow.Client?.Close();
+                    }
+                });
+            }
             try
             {
                 string tempPath = System.IO.Path.GetTempPath();
@@ -323,7 +341,7 @@ namespace chatclient
                     log.Error("保存登录信息到临时文件失败", ex);
                 }
             }
-            if (MainWindow.token == null) Application.Current.Shutdown();
+            if (MainWindow.token == null) Application.Current.Shutdown(); 
         }
     }
 }
diff --git a/chatclient/MainWindow.xaml b/chatclient/MainWindow.xaml
index 1c1c515..cf720da 100644
--- a/chatclient/MainWindow.xaml
+++ b/chatclient/MainWindow.xaml
@@ -125,7 +125,7 @@
                                         <RowDefinition Height="Auto"/>
                                     </Grid.RowDefinitions>
                                     <TextBox x:Name="txtMessage" Grid.Row="0" materialDesign:HintAssist.Hint="输入消息..." AcceptsReturn="True" VerticalScrollBarVisibility="Auto"
-                                             TextWrapping="Wrap" MinHeight="50" MaxHeight="100" Margin="5" BorderBrush="#00000000" CaretBrush="#00673AB7" SelectionBrush="#00B39DDB"/>
+                                             TextWrapping="Wrap" MinHeight="50" MaxHeight="100" Margin="5" BorderBrush="#00000000"/>
                                     <Button x:Name="btnSend" Grid.Row="1" Content="发送" MinWidth="80" Style="{StaticResource MaterialDesignRaisedButton}"
                                             Click="SendMessage_Click" Width="20" HorizontalAlignment="Right" Margin="2,2,4,4"/>
                                 </Grid>