Browse Source

填写与签名-退出时关闭缩略图

liyijie 2 years ago
parent
commit
b808b7f5b5

+ 12 - 1
PDF Office/ViewModels/FillAndSign/FillAndSignContentViewModel.cs

@@ -61,6 +61,13 @@ namespace PDF_Office.ViewModels.FillAndSign
         public double FillOpacity = 1;
         public double LineWidth = 1;
         public double LineWidthMultiple = 1;
+
+        private bool _HookShapeIsCheck=true;
+        public bool HookShapeIsCheck {
+            get { return _HookShapeIsCheck; }
+            set { SetProperty(ref _HookShapeIsCheck,value); }
+        
+        }
         #endregion
 
         #region Command
@@ -1154,7 +1161,10 @@ namespace PDF_Office.ViewModels.FillAndSign
             ContextMenu contextMenu = App.Current.FindResource("ViewerContextMenu") as ContextMenu;
 
             ViewerContextMenu_Loaded(contextMenu, null,Visibility.Visible);
-            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+            viewContentViewModel.SelectedPrpoertyPanel("PropertyPanelContent", null);
+            PDFViewer.SetMouseMode(MouseModes.PanTool);
+            ShowPropertyPanel(false);
+           
         }
 
         public void OnNavigatedTo(NavigationContext navigationContext)
@@ -1162,6 +1172,7 @@ namespace PDF_Office.ViewModels.FillAndSign
             navigationContext.Parameters.TryGetValue<ViewContentViewModel>(ParameterNames.ViewContentViewModel, out viewContentViewModel);
             navigationContext.Parameters.TryGetValue<CPDFViewer>(ParameterNames.PDFViewer, out PDFViewer);
             BindingPDFViewerHandler();
+            HookShapeIsCheck=true;
             InitCheckedEvent("RbtnTick");
             IsEdit = false;
         }

+ 2 - 0
PDF Office/ViewModels/Tools/ConverterBarContentViewModel.cs

@@ -270,6 +270,8 @@ namespace PDF_Office.ViewModels.Tools
             if (PDFViewer != null)
             {
                 isFirstLoad = false;
+                viewContentViewModel.IsPropertyOpen = false;
+                PDFViewer.SetMouseMode(MouseModes.PanTool);
             }
         }
     }

+ 1 - 1
PDF Office/Views/FillAndSign/FillAndSignContent.xaml

@@ -38,7 +38,7 @@
                         </i:EventTrigger>
                     </i:Interaction.Triggers>
                 </RadioButton>-->
-                <RadioButton Name="RbtnTick" IsChecked="True"  Width="36" Height="36">
+                <RadioButton Name="RbtnTick" IsChecked="{Binding HookShapeIsCheck}"  Width="36" Height="36">
                     <Path Data="M17.3725 3.20441L18.5688 4.10928L8.73555 17.1099L2.46973 10.844L3.53039 9.78337L8.57806 14.831L17.3725 3.20441Z" Fill="Black" />
                     <i:Interaction.Triggers>
                         <i:EventTrigger EventName="Checked">