修复 每个页面标题的返回按钮，都添加 iconPack， 不然返回上一个页面时，返回按钮内的图标会不见了。应该是 MapApps.Metro.IconPacks 的bug

MultiLayout/PgMenu.xaml

@@ -43,7 +43,9 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" >
-            <Button Style="{StaticResource Styles.TitleBar.BackButton}" Click="btnBackClick"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton}" Click="btnBackClick" >
+                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+            </Button>
         </StackPanel>
         <ScrollViewer Grid.Row="1" VerticalScrollBarVisibility="Disabled" HorizontalScrollBarVisibility="Auto" >
             <Grid>

Project.FLY.ControlLibrary/FLY.ControlLibrary/Themes/SectionStyle2.xaml

@@ -67,11 +67,18 @@
         <Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
         <Setter Property="Content">
             <Setter.Value>
-                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" 
-                                            HorizontalAlignment="Right" VerticalAlignment="Center" Margin="0" 
-                                            Width="60" Height="auto" />
+                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
             </Setter.Value>
         </Setter>
+        <Style.Resources>
+            <Style TargetType="iconPacks:PackIconMaterial" >
+                <Setter Property="Width" Value="60"/>
+                <Setter Property="Height" Value="Auto" />
+                <Setter Property="HorizontalAlignment" Value="Right" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="Margin" Value="0" />
+            </Style>
+        </Style.Resources>
     </Style>
 
 
@@ -88,12 +95,21 @@
         <Setter Property="Foreground" Value="{StaticResource Brushes.TitleBar.Foreground}"/>
         <Setter Property="Background" Value="{StaticResource Brushes.TitleBar.Background}"/>
         <Setter Property="Width" Value="60"/>
-        <Setter Property="Height" Value="{Binding Width,RelativeSource={RelativeSource Mode=Self}}"/>
+        <Setter Property="Height" Value="60"/>
         <Setter Property="Content">
             <Setter.Value>
-                <iconPacks:PackIconMaterial Kind="ArrowLeftBold" SnapsToDevicePixels ="True" Width="30" Height="auto" HorizontalAlignment="Center" VerticalAlignment="Center"/>
+                <iconPacks:PackIconMaterial Kind="ArrowLeftBold"/>
             </Setter.Value>
         </Setter>
+        <Style.Resources>
+            <Style TargetType="iconPacks:PackIconMaterial" >
+                <Setter Property="Width" Value="30"/>
+                <Setter Property="Height" Value="Auto" />
+                <Setter Property="HorizontalAlignment" Value="Center" />
+                <Setter Property="VerticalAlignment" Value="Center" />
+                <Setter Property="SnapsToDevicePixels" Value="True" />
+            </Style>
+        </Style.Resources>
     </Style>
     
     <!--标题区,左边的后退键(白底蓝图标) 小-->

Project.FLY.Thick.Base/FLY.Thick.Base.UI/CtMicroGage.xaml

@@ -101,7 +101,7 @@
             <local:CtMircoGageVmUt x:Key="viewModel" 
                 Thick="300.3" AD="12000" ADMax="65535" Position="5001" PosLength="8900" PosMm="500.1" Velocity="5.1" ControllerState="定点"
                 OStatus="0x00F5" IStatus="0xff7f" IsIOShowNo ="True"
-                IsError="False" ErrMsg="枫莱尔控制器连接断开" 
+                IsError="True" ErrMsg="枫莱尔控制器连接断开" 
                 />
         </ResourceDictionary>
     </UserControl.Resources>
@@ -292,9 +292,9 @@
                             <ColumnDefinition Width="auto"/>
                             <ColumnDefinition/>
                         </Grid.ColumnDefinitions>
-                        <Path Margin="5,2" Fill="White" Stretch="Uniform" Width="12" Height="12" SnapsToDevicePixels="True" Data="{StaticResource Geometry_alert-circle-outline}"  >
-                            <Path.Style>
-                                <Style TargetType="Path">
+                        <iconPacks:PackIconMaterial Kind="AlertCircleOutline" Foreground="White" Width="12" Height="12" SnapsToDevicePixels="True" Margin="5,2" >
+                            <iconPacks:PackIconMaterial.Style>
+                                <Style TargetType="iconPacks:PackIconMaterial">
                                     <Style.Triggers>
                                         <DataTrigger Binding="{Binding IsError}" Value="True">
                                             <DataTrigger.EnterActions>
@@ -308,8 +308,8 @@
                                         </DataTrigger>
                                     </Style.Triggers>
                                 </Style>
-                            </Path.Style>
-                        </Path>
+                            </iconPacks:PackIconMaterial.Style>
+                        </iconPacks:PackIconMaterial>
                         <TextBlock Grid.Column="1" Style="{StaticResource ItemHeaderStyle}" VerticalAlignment="Center" Foreground="White" Text="{Binding ErrMsg}"/>
                     </Grid>
                 </Grid>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgAddress.xaml

@@ -18,7 +18,9 @@
             <RowDefinition  />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal"  Background="{StaticResource Brushes.TitleBar.Background}" >
-            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" >
+                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+            </Button>
             <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgAddress.Title}"/>
         </StackPanel>
         <DataGrid AlternationCount ="2" AlternatingRowBackground="LightGray"  AutoGenerateColumns="False" CanUserAddRows="False" Margin="{StaticResource ControlMargin}" 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgBorderSearch.xaml

@@ -36,7 +36,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgBorderSearch.Title}"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgError/PgErrorAllTable.xaml

@@ -26,7 +26,9 @@
 
         <Grid Background="{StaticResource Brushes.TitleBar.Background}" >
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgErrorAllTable.Title}"/>
             </StackPanel>
         </Grid>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgError/PgErrorTable.xaml

@@ -38,7 +38,7 @@
     <Grid Background="{StaticResource Brushes.ThemeBackground}">
         <Grid.RowDefinitions>
             <RowDefinition Height="auto" />
-            <RowDefinition Height="496*" />
+            <RowDefinition />
         </Grid.RowDefinitions>
         <Grid Background="{StaticResource Brushes.TitleBar.Background}">
             <Grid.ColumnDefinitions>
@@ -46,7 +46,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgErrorTable.Title}"/>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0">
                     <Button Style="{StaticResource buttonStyle}" Click="button_iotip_click" >

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgError/PgErrorTable2.xaml

@@ -45,7 +45,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"    >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgErrorTable.Title}"/>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0">
                     <Button Style="{StaticResource buttonStyle}" Click="button_database_click" >

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgError/PgErrorsTable.xaml

@@ -46,7 +46,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Click="button_back_Click" />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Click="button_back_Click" >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgErrorTable.Title}"/>
                 <StackPanel Orientation="Horizontal" VerticalAlignment="Center" Margin="60,0,0,0">
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgFlyAd.xaml

@@ -4,7 +4,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:FLY.Thick.Base.UI"  
-      xmlns:common="clr-namespace:FLY.Thick.Base.Common;assembly=FLY.Thick.Base" xmlns:conv="clr-namespace:FLY.Thick.Base.UI.Converter"
+      xmlns:common="clr-namespace:FLY.Thick.Base.Common;assembly=FLY.Thick.Base" xmlns:conv="clr-namespace:FLY.Thick.Base.UI.Converter" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       mc:Ignorable="d" 
       d:DesignHeight="1200" d:DesignWidth="1024"
       Background="WhiteSmoke"
@@ -31,7 +31,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"   >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgFlyAd.Title}"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGageInfo.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       mc:Ignorable="d" 
       xmlns:Chr="clr-namespace:System.Windows.Forms.DataVisualization.Charting;assembly=System.Windows.Forms.DataVisualization"
-      xmlns:local ="clr-namespace:FLY.Thick.Base.UI"
+      xmlns:local ="clr-namespace:FLY.Thick.Base.UI" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       d:DesignHeight="768" d:DesignWidth="1024"
       Loaded="Page_Loaded" Unloaded="Page_Unloaded"
 	Title="Page_GageInfo">
@@ -24,7 +24,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack" />
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"   >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}"  Text="{StaticResource str.PgGageInfo.Title}"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGetSample.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:FLY.Thick.Base.UI"
       xmlns:sys="clr-namespace:System;assembly=mscorlib" 
-      xmlns:conv="clr-namespace:FLY.Thick.Base.UI.Converter"
+      xmlns:conv="clr-namespace:FLY.Thick.Base.UI.Converter" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       mc:Ignorable="d" 
       d:DesignHeight="1200" d:DesignWidth="1024">
     <Page.Resources>
@@ -24,7 +24,9 @@
         </Grid.RowDefinitions>
         <Grid Name="grid_initparam"/>
         <StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
-            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+            </Button>
             <TextBlock Style="{StaticResource Styles.TitleBar.Text}" >
                 <Run Text="{Binding InfoName}"/><Run Text="{StaticResource str.PgGetSample.Title}"/>
             </TextBlock>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgGrid.xaml

@@ -30,7 +30,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgGrid.Title}"/>
                 <StackPanel VerticalAlignment="Center">
 

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgInitparam.xaml

@@ -26,7 +26,9 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal" Background="{StaticResource Brushes.TitleBar.Background}">
-            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+            </Button>
             <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgInitparam.Title}"/>
         </StackPanel>
         <ScrollViewer CanContentScroll="False" PanningMode="Both" Grid.Row="1" >

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgPwManager.xaml

@@ -19,7 +19,9 @@
             <RowDefinition />
         </Grid.RowDefinitions>
         <StackPanel Orientation="Horizontal"  Background="{StaticResource Brushes.TitleBar.Background}" >
-            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+            <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+            </Button>
             <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgPwManager.Title}"/>
         </StackPanel>
         <ScrollViewer  PanningMode="Both" Grid.Row="1" >

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgReject.xaml

@@ -5,7 +5,7 @@
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:FLY.Thick.Base.UI"
       xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" 
-      xmlns:conv="clr-namespace:FLY.Thick.Base.UI.Converter"
+      xmlns:conv="clr-namespace:FLY.Thick.Base.UI.Converter" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       mc:Ignorable="d" 
       d:DesignHeight="768" d:DesignWidth="1024"
       Background="WhiteSmoke"
@@ -38,7 +38,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgReject.Title}"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/PgScanCorr.xaml

@@ -6,7 +6,7 @@
       mc:Ignorable="d" 
       xmlns:local ="clr-namespace:FLY.Thick.Base.UI"
       xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf"
-      xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
+      xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       d:DesignHeight="1500" d:DesignWidth="1280"
       Background="WhiteSmoke"
 	Title="Page_ScanCorr">
@@ -26,7 +26,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="{StaticResource str.PgScanCorr.Title}"/>
             </StackPanel>
             <local:CtMicroGage Grid.Column="1" x:Name="mircoGage" Background="Transparent" VerticalAlignment="Bottom"/>

Project.FLY.Thick.Base/FLY.Thick.Base.UI/UiModule/FixGraph/PgFixAnalyze.xaml

@@ -4,7 +4,7 @@
       xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006" 
       xmlns:d="http://schemas.microsoft.com/expression/blend/2008" 
       xmlns:local="clr-namespace:FLY.Thick.Base.UI.UiModule"
-      xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls"
+      xmlns:lvc="clr-namespace:LiveCharts.Wpf;assembly=LiveCharts.Wpf" xmlns:Controls="http://metro.mahapps.com/winfx/xaml/controls" xmlns:iconPacks="http://metro.mahapps.com/winfx/xaml/iconpacks"
       mc:Ignorable="d" 
       d:DesignHeight="450" d:DesignWidth="800"
       Background="White"
@@ -95,7 +95,9 @@
                 <ColumnDefinition Width="auto"/>
             </Grid.ColumnDefinitions>
             <StackPanel Orientation="Horizontal" >
-                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"/>
+                <Button Style="{StaticResource Styles.TitleBar.BackButton2}" Command="BrowseBack"  >
+                    <iconPacks:PackIconMaterial Kind="ArrowLeftThick" />
+                </Button>
                 <TextBlock Style="{StaticResource Styles.TitleBar.Text}" Text="FFT"/>
             </StackPanel>
         </Grid>