From 99df058a665ea04065a23e729ec79a2f23f79881 Mon Sep 17 00:00:00 2001
From: alielie <alielie@git.com>
Date: 星期二, 20 五月 2025 16:59:43 +0800
Subject: [PATCH] 优化

---
 WPFProject/PanuonWindow.xaml |   33 +++++++++++++++++++++++++++++----
 1 files changed, 29 insertions(+), 4 deletions(-)

diff --git a/WPFProject/PanuonWindow.xaml b/WPFProject/PanuonWindow.xaml
index e2f650f..867d337 100644
--- a/WPFProject/PanuonWindow.xaml
+++ b/WPFProject/PanuonWindow.xaml
@@ -12,12 +12,13 @@
             WindowState="Maximized"
             x:Name="window"
             BorderBrush="Transparent"
-            pu:WindowXCaption.Buttons="All"
+            pu:WindowXCaption.Buttons="None"
             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"
             Closed="window_Closed"
             Topmost="False"
+            Title="TestPlatform"
             pu:WindowXCaption.Background="Transparent"
             pu:WindowXCaption.Height="80"
             IsOverlayerVisible="True"
@@ -88,9 +89,10 @@
                 FontFamily="/HMI.UI;component/Resources/Font/#iconfont"
                 Content="&#xe60e;"
                 RenderTransformOrigin="0.5,0.5"
-                Click="Button_Click_2">
+                Click="Button_Click">
                 <Button.Style>
                     <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MinimizeButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
                         <Style.Triggers>
                             <DataTrigger Binding="{Binding ShowMenu}" Value="True">
                                 <Setter Property="Button.RenderTransform">
@@ -102,7 +104,30 @@
                         </Style.Triggers>
                     </Style>
                 </Button.Style>
+            </Button>
 
+            <Button FontSize="18" Click="Button_Click" x:Name="minBtn">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MinimizeButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
+                    </Style>
+                </Button.Style>
+            </Button>
+
+            <Button FontSize="18" Click="Button_Click" x:Name="maxBtn">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.MaximizeButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
+                    </Style>
+                </Button.Style>
+            </Button>
+
+            <Button FontSize="18" Click="Button_Click" x:Name="closeBtn">
+                <Button.Style>
+                    <Style TargetType="Button" BasedOn="{StaticResource {x:Static pu:WindowXCaption.CloseButtonStyleKey}}">
+                        <Setter Property="Focusable" Value="False"/>
+                    </Style>
+                </Button.Style>
             </Button>
         </StackPanel>
     </pu:WindowXCaption.ExtendControl>
@@ -110,7 +135,7 @@
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition/>
-            <RowDefinition Height="30"/>
+            <RowDefinition Height="Auto"/>
         </Grid.RowDefinitions>
 
         <ctl:MainTabControl Grid.Row="0" x:Name="menuTab">
@@ -120,6 +145,6 @@
         <!--<ctl:MenuTabControl Grid.Row="1" x:Name="menuTab" OnTabChange="menuTab_OnTabChange"> </ctl:MenuTabControl>-->
 
 
-        <StatusBar Grid.Row="1" Background="{StaticResource HoriBar}"></StatusBar>
+        <!--<StatusBar Grid.Row="1" Background="{StaticResource HoriBar}"></StatusBar>-->
     </Grid>
 </pu:WindowX>

--
Gitblit v1.9.1