综合-更新安装包配置，提交顶部菜单栏悬浮效果部分代码(待完善)

PDF Master.aip

@@ -507,7 +507,7 @@
     <ROW BootstrOptKey="GlobalOptions" DownloadFolder="[AppDataFolder][|Manufacturer]\[|ProductName]\prerequisites" Options="2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.BuildComponent">
-    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="Setup Files" Languages="en;zh_TW;zh;en_GB;de;fr;es" LangOpt="1" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" Options="2" UseLargeSchema="true" Unicode="true" ExeName="PDF Master" MsiPackageType="AI_ALL" UACExecutionLevel="2"/>
+    <ROW BuildKey="DefaultBuild" BuildName="DefaultBuild" BuildOrder="1" BuildType="1" PackageFolder="Setup Files" Languages="en;zh_TW;zh;en_GB;de;fr;es" LangOpt="1" InstallationType="4" CabsLocation="1" PackageType="1" FilesInsideExe="true" ExtractionFolder="[AppDataFolder][|Manufacturer]\[|ProductName] [|ProductVersion]\install" ExtUI="true" Options="2" UseLargeSchema="true" Unicode="true" ExeName="PDF Master [|ProductVersion]" MsiPackageType="AI_ALL" UACExecutionLevel="2"/>
   </COMPONENT>
   <COMPONENT cid="caphyon.advinst.msicomp.DefaultProgramsComponent">
     <ROW ApplicationDescription="PDF Master" ApplicationName="[ProductName]" CapabilitiesPath="SOFTWARE\[Manufacturer]\[ProductName]" RegistryKey="ApplicationDescription" RegistryAppName="ApplicationName" RegistryRegisterApp="ProductName_2"/>

PDF Office/Views/ViewContent.xaml

@@ -131,7 +131,10 @@
                             <MenuItem Header="Create Files">
                                 <MenuItem Command="{Binding CreateFromFile}" Header="Create From File" />
                                 <MenuItem Command="{Binding CreateBlankFileCommand}" Header="Create Blank" />
-                                <MenuItem Command="{Binding mainViewModel.homeContentViewModel.CreateFromScanner}" CommandParameter="View" Header="Create Form Scanner" />
+                                <MenuItem
+                                    Command="{Binding mainViewModel.homeContentViewModel.CreateFromScanner}"
+                                    CommandParameter="View"
+                                    Header="Create Form Scanner" />
                             </MenuItem>
                             <MenuItem
                                 Command="{Binding mainViewModel.mainWindowViewModel.AddTab}"
@@ -336,6 +339,8 @@
                 HorizontalAlignment="Center"
                 VerticalAlignment="Top"
                 BorderThickness="0"
+                PreviewMouseDoubleClick="ToolTabControl_PreviewMouseDoubleClick"
+                PreviewMouseLeftButtonDown="ToolTabControl_PreviewMouseLeftButtonDown"
                 SelectedIndex="{Binding TabSelectedIndex, Mode=TwoWay}"
                 Style="{StaticResource TabControlWithUnderLineStyle}"
                 Visibility="{Binding IsReadMode}">
@@ -406,6 +411,7 @@
         <ContentControl
             Name="ContentToolsBar"
             Grid.Row="{Binding GridToolRow}"
+            Panel.ZIndex="2"
             prism:RegionManager.RegionName="{Binding ToolsBarContentRegionName}"
             Visibility="{Binding ToolsBarContentVisible}" />
 
@@ -421,7 +427,11 @@
             prism:RegionManager.RegionName="{Binding TextEditContentRegionName}"
             Visibility="{Binding TextEditToolContentVisible}" />
 
-        <Grid Name="DocumentView" Grid.Row="2">
+        <Grid
+            Name="DocumentView"
+            Grid.Row="1"
+            Grid.RowSpan="2"
+            Panel.ZIndex="0">
             <Grid.ColumnDefinitions>
                 <ColumnDefinition
                     x:Name="BOTACloumn"

PDF Office/Views/ViewContent.xaml.cs

@@ -32,6 +32,10 @@ namespace PDF_Master.Views
 
         private string unicode = "";
 
+        /// <summary>
+        /// 是否是固定模式
+        /// </summary>
+        private bool keep = true;
         public ViewContent()
         {
             InitializeComponent();
@@ -332,5 +336,39 @@ namespace PDF_Master.Views
         {
             viewModel.CloseAutoSave();
         }
+
+        private void ToolTabControl_PreviewMouseLeftButtonDown(object sender, MouseButtonEventArgs e)
+        {
+            if (!keep)
+            {
+                if (ContentToolsBar.Visibility == Visibility.Visible)
+                {
+                    ContentToolsBar.Visibility = Visibility.Collapsed;
+                }
+                else
+                {
+                    ContentToolsBar.Visibility = Visibility.Visible;
+                }
+            }
+        }
+
+        private void ToolTabControl_PreviewMouseDoubleClick(object sender, MouseButtonEventArgs e)
+        {
+            if (e.LeftButton == MouseButtonState.Pressed)
+            {
+                if (keep)
+                {
+                    Grid.SetRow(DocumentView, 1);
+                    Grid.SetRowSpan(DocumentView, 2);
+                    keep = !keep;
+                }
+                else
+                {
+                    Grid.SetRow(DocumentView, 2);
+                    Grid.SetRowSpan(DocumentView, 1);
+                    keep = !keep;
+                }
+            }
+        }
     }
 }