From 4adf06e546f77eeba227474e633dcc0105f802f9 Mon Sep 17 00:00:00 2001
From: chr <chrry550@163.com>
Date: 星期六, 24 二月 2024 10:50:58 +0800
Subject: [PATCH] 完善Zindex层级显示

---
 Controls/InnerWindow.xaml |   47 +++++++++++++++++++++++++----------------------
 1 files changed, 25 insertions(+), 22 deletions(-)

diff --git a/Controls/InnerWindow.xaml b/Controls/InnerWindow.xaml
index 53aa544..8ca1095 100644
--- a/Controls/InnerWindow.xaml
+++ b/Controls/InnerWindow.xaml
@@ -9,7 +9,8 @@
              HorizontalContentAlignment="Stretch"
              SizeChanged="UserControl_SizeChanged"
              MouseLeftButtonDown="Grid_MouseLeftButtonDown"
-             Background="#FFF" >
+             Background="#FFF"
+             Focusable="True">
     <UserControl.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
@@ -32,32 +33,34 @@
 
     <UserControl.Template>
         <ControlTemplate TargetType="UserControl">
-            <Grid>
-                <Grid.RowDefinitions>
-                    <RowDefinition Height="30"/>
-                    <RowDefinition Height="*"/>
-                </Grid.RowDefinitions>
+            <AdornerDecorator HorizontalAlignment="Stretch" VerticalAlignment="Stretch" >
+                <Grid GotFocus="Grid_GotFocus">
+                    <Grid.RowDefinitions>
+                        <RowDefinition Height="30"/>
+                        <RowDefinition Height="*"/>
+                    </Grid.RowDefinitions>
 
-                <Grid>
-                    <Grid.ColumnDefinitions>
-                        <ColumnDefinition Width="*"/>
-                        <ColumnDefinition Width="Auto"/>
-                    </Grid.ColumnDefinitions>
+                    <Grid>
+                        <Grid.ColumnDefinitions>
+                            <ColumnDefinition Width="*"/>
+                            <ColumnDefinition Width="Auto"/>
+                        </Grid.ColumnDefinitions>
 
-                    <Thumb Style="{StaticResource SliderThumbStyle}" Grid.Column="0" x:Name="thumb1" DragDelta="DragDelta" 
+                        <Thumb Style="{StaticResource SliderThumbStyle}" Grid.Column="0" x:Name="thumb1" DragDelta="DragDelta" 
                            DragStarted="DragStarted" DragCompleted="DragCompleted"/>
 
-                    <StackPanel Grid.Column="1" Orientation="Horizontal">
-                        <Button Style="{StaticResource ChildWindowButton}" Click="Min_Click">&#xe650;</Button>
-                        <Button Style="{StaticResource ChildWindowButton}" Click="Max_Click" >&#xe534;</Button>
-                        <Button Style="{StaticResource ChildWindowCloseButton}" Click="CLose_Click">&#xe609;</Button>
-                    </StackPanel>
-                </Grid>
+                        <StackPanel Grid.Column="1" Orientation="Horizontal">
+                            <Button Style="{StaticResource ChildWindowButton}" Click="Min_Click">&#xe650;</Button>
+                            <Button Style="{StaticResource ChildWindowButton}" Click="Max_Click" >&#xe534;</Button>
+                            <Button Style="{StaticResource ChildWindowCloseButton}" Click="CLose_Click">&#xe609;</Button>
+                        </StackPanel>
+                    </Grid>
 
-                <Border Grid.Row="1" VerticalAlignment="Stretch" BorderThickness="2,0,2,2" BorderBrush="{Binding HeaderBackground}">
-                    <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch"></ContentPresenter>
-                </Border>
-            </Grid>
+                    <Border Grid.Row="1" Background="LightGray" VerticalAlignment="Stretch" BorderThickness="2,0,2,2" BorderBrush="{Binding HeaderBackground}">
+                        <ContentPresenter HorizontalAlignment="Stretch" VerticalAlignment="Stretch"></ContentPresenter>
+                    </Border>
+                </Grid>
+            </AdornerDecorator>
         </ControlTemplate>
     </UserControl.Template>
 </UserControl>
\ No newline at end of file

--
Gitblit v1.9.1