fix: 扩展内容到标题以便显示完整背景图片到标题

Hikarisame-Technology · Oct 18, 2024 · ea88a80 · ea88a80
1 parent a4e411d
commit ea88a80
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/SYSTools/MainWindow.xaml b/SYSTools/MainWindow.xaml
@@ -14,19 +14,34 @@
         muxc:TitleBar.IsBackButtonVisible="False"
         muxc:TitleBar.ButtonGlyphStyle="Fluent"
         muxc:TitleBar.Height="48"
-        Height="670" Width="1100" MinWidth="1100" MinHeight="670" Loaded="Window_Loaded" Closed="Window_Closed" Deactivated="Window_Deactivated">
-
+        muxc:TitleBar.ExtendViewIntoTitleBar="True"
+        Loaded="Window_Loaded"
+        Closed="Window_Closed"
+        Deactivated="Window_Deactivated"
+        Height="670" Width="1100" MinWidth="1100" MinHeight="670" >
+
     <Grid>
         <!--设定为预设无背景图片-->
         <Image x:Name="BackImage" Stretch="UniformToFill" Source="/Resources/NoBackImage.png">
             <Image.Effect>
                 <BlurEffect/>
             </Image.Effect>
         </Image>
-
-        <Border x:Name="AppTitleBar" Grid.Column="1" VerticalAlignment="Top" Height="24" Margin="50,12,0,0">
-            <TextBlock x:Name="AppTitle" Text="" VerticalAlignment="Top" Margin="0,8,0,0"/>
-        </Border>
+
+        <Grid x:Name="AppTitleBar"  
+      Height="48" HorizontalAlignment="Left" VerticalAlignment="Top">
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition x:Name="LeftPaddingColumn" Width="0"/>
+                <ColumnDefinition/>
+                <ColumnDefinition x:Name="RightPaddingColumn" Width="0"/>
+            </Grid.ColumnDefinitions>
+            <TextBlock x:Name="TitleBarTextBlock" 
+               FontWeight="Regular"
+               FontSize="12"
+               Grid.Column="1"
+               VerticalAlignment="Center"
+               Margin="16,0,0,0"/>
+        </Grid>
 
         <muxc:NavigationView x:Name="Sidebar" 
                              IsBackButtonVisible="Collapsed"

diff --git a/SYSTools/MainWindow.xaml.cs b/SYSTools/MainWindow.xaml.cs
@@ -80,7 +80,7 @@ private void Window_Loaded(object sender, RoutedEventArgs e)
                 );
                 Close();
             }
-            Title = "SYSTools Ver" + (Application.ResourceAssembly.GetName().Version.ToString());
+            TitleBarTextBlock.Text = "SYSTools Ver" + (Application.ResourceAssembly.GetName().Version.ToString());
             // 设置默认启动Page页
             CurrentPage.Navigate(Home_Page, new DrillInNavigationTransitionInfo());
         }

diff --git a/SYSTools/Properties/AssemblyInfo.cs b/SYSTools/Properties/AssemblyInfo.cs
@@ -51,5 +51,5 @@
 //可以指定所有这些值，也可以使用“生成号”和“修订号”的默认值
 //通过使用 "*"，如下所示:
 // [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("0.7.*")]
+[assembly: AssemblyVersion("0.7.2.*")]
 //[assembly: AssemblyFileVersion("0.7.1.0")]