From 2e54b439c64e0adbb7e010243c1f33aa5fc5f503 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 11 三月 2025 14:08:57 +0800
Subject: [PATCH] 完善程序； Merge branch 'master' of http://58.211.88.246:3600/r/WPF/WPFProject

---
 WPFProject/PanuonWindow.xaml |   57 +++++++++++++++++++++++++++++++++++++++++++++------------
 1 files changed, 45 insertions(+), 12 deletions(-)

diff --git a/WPFProject/PanuonWindow.xaml b/WPFProject/PanuonWindow.xaml
index 4f54589..f2d416d 100644
--- a/WPFProject/PanuonWindow.xaml
+++ b/WPFProject/PanuonWindow.xaml
@@ -11,19 +11,38 @@
             WindowStartupLocation="CenterOwner"
             WindowState="Maximized"
             x:Name="window"
-            BorderBrush="{StaticResource MainBorder}"
+            BorderBrush="Transparent"
             Loaded="window_Loaded"
-            pu:WindowXCaption.Background="{StaticResource MainBorder}"
-            pu:WindowXCaption.Foreground="#FFF" d:DesignHeight="115.146" d:DesignWidth="341.223">
+            xmlns:sys="clr-namespace:System;assembly=mscorlib"
+            xmlns:dp="clr-namespace:HMI.UI.DpUtil;assembly=HMI.UI"
+            xmlns:hc="clr-namespace:HMI.Core;assembly=HMI.Core"
+            pu:WindowXCaption.Background="Transparent"
+            pu:WindowXCaption.Height="80"
+            pu:WindowXCaption.Foreground="#FFF" >
+    <Window.Resources>
+        <hc:LangConverter x:Key="lc"/>
+    </Window.Resources>
+    <Window.Background>
+        <ImageBrush Stretch="Uniform" AlignmentX="Left" AlignmentY="Top"  
+                    ImageSource="/Resources/Background.png"/>
+    </Window.Background>
 
     <pu:WindowXCaption.HeaderTemplate>
         <DataTemplate>
             <StackPanel DataContext="{Binding ElementName=window}" Orientation="Horizontal"
-                    Margin="5,0,0,0">
-                <Image Source="{Binding WindowLogo}"
-                   RenderOptions.BitmapScalingMode="HighQuality"
-                   Height="{StaticResource TitleFontSize}" />
-                <TextBlock FontSize="{StaticResource TitleFontSize}" VerticalAlignment="Center" Text="{Binding WindowTitle}"/>
+                        VerticalAlignment="Center"
+                        dp:StackPanelHelper.ChildSpace="30" Margin="5,0,0,0" Height="100">
+                <Image Source="{Binding WindowLogo}" Height="60" VerticalAlignment="Center" Stretch="Fill"
+       RenderOptions.BitmapScalingMode="HighQuality" />
+                <TextBlock FontSize="30" VerticalAlignment="Center" Text="{Binding WindowTitle}">
+                    <TextBlock.Effect>
+                        <DropShadowEffect ShadowDepth="8"
+      Direction="330"
+      Color="Black"
+      Opacity="0.5"
+     BlurRadius="4"/>
+                    </TextBlock.Effect>
+                </TextBlock>
             </StackPanel>
         </DataTemplate>
     </pu:WindowXCaption.HeaderTemplate>
@@ -32,11 +51,25 @@
         <StackPanel Orientation="Horizontal">
             <Button x:Name="BtnSwitchTheme"
                 FontSize="18"
-                ToolTip="Light / Dark"
-                Style="{StaticResource {x:Static pu:WindowXCaption.MinimizeButtonStyleKey}}"
                 FontFamily="/HMI.UI;component/Resources/Font/#iconfont"
                 Content="&#xe60e;"
-                Click="Button_Click_2"/>
+                RenderTransformOrigin="0.5,0.5"
+                Click="Button_Click_2">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MinimizeButtonStyleKey}}">
+                        <Style.Triggers>
+                            <DataTrigger Binding="{Binding ShowMenu}" Value="True">
+                                <Setter Property="Button.RenderTransform">
+                                    <Setter.Value>
+                                        <RotateTransform x:Name="MyAnimatedTransform" Angle="180" />
+                                    </Setter.Value>
+                                </Setter>
+                            </DataTrigger>
+                        </Style.Triggers>
+                    </Style>
+                </Button.Style>
+                
+            </Button>
         </StackPanel>
     </pu:WindowXCaption.ExtendControl>
 
@@ -53,6 +86,6 @@
         <!--<ctl:MenuTabControl Grid.Row="1" x:Name="menuTab" OnTabChange="menuTab_OnTabChange"> </ctl:MenuTabControl>-->
 
 
-        <StatusBar Grid.Row="1" Background="{StaticResource MainStatusBar}">99999</StatusBar>
+        <StatusBar Grid.Row="1" Background="{StaticResource HoriBar}"></StatusBar>
     </Grid>
 </pu:WindowX>

--
Gitblit v1.9.1