Browse Source

compdfkit(win) - 修复Bota选中问题和右键菜单

weixiangjie 1 year ago
parent
commit
2ed11dd041

+ 1 - 1
Demo/Examples/Compdfkit_Tools/Common/BarControl/CPDFBOTABarControl.xaml.cs

@@ -117,7 +117,7 @@ namespace Compdfkit_Tools.PDFControl
                 {
                     if (BOTABarTitleGrid.Children[0] is ToggleButton buttonTool)
                     {
-                        //SelectBotaTool(botaToolBtnDic.FirstOrDefault(x => x.Value == buttonTool).Key);
+                        SelectBotaTool(botaToolBtnDic.FirstOrDefault(x => x.Value == buttonTool).Key);
                     }
                 }
                 else

+ 9 - 4
Demo/Examples/PDFViewer/MainPage.xaml.cs

@@ -168,14 +168,20 @@ namespace PDFViewer
 
             pdfViewer.PDFView.ChangeFitMode(FitMode.FitWidth);
             CPDFSaclingControl.InitWithPDFViewer(pdfViewer.PDFView);
-            ModeComboBox.SelectedIndex = 0;
-
             CPDFSaclingControl.SetZoomTextBoxText(string.Format("{0}", (int)(pdfViewer.PDFView.ZoomFactor * 100)));
 
             ViewSettingBtn.IsChecked = false;
             botaBarControl.InitWithPDFViewer(pdfViewer.PDFView);
+            ModeComboBox.SelectedIndex = 0;
             botaBarControl.AddBOTAContent(new []{BOTATools.Thumbnail , BOTATools.Outline , BOTATools.Bookmark , BOTATools.Annotation , BOTATools.Search});
             botaBarControl.SelectBotaTool(BOTATools.Thumbnail);
+            botaBarControl.DeleteSignatureEvent -= BotaControlOnDeleteSignatureEvent;
+            botaBarControl.DeleteSignatureEvent += BotaControlOnDeleteSignatureEvent;
+            botaBarControl.ViewCertificateEvent -= digitalSignatureControl.ViewCertificateEvent;
+            botaBarControl.ViewCertificateEvent += digitalSignatureControl.ViewCertificateEvent;
+            botaBarControl.ViewSignatureEvent -= digitalSignatureControl.ViewSignatureEvent;    
+            botaBarControl.ViewSignatureEvent += digitalSignatureControl.ViewSignatureEvent;
+            
             displaySettingsControl.InitWithPDFViewer(pdfViewer.PDFView);
             LoadCustomControl();
             panelState.PropertyChanged -= PanelState_PropertyChanged;
@@ -322,7 +328,6 @@ namespace PDFViewer
         {
             pdfViewer.PDFView.UndoManager.CanSave = true;
             DigitalSignatureControl_OnSignatureStatusChanged(sender, e);
-            //this.CanSave = true;
         }
         
         /// <summary>
@@ -353,7 +358,7 @@ namespace PDFViewer
         #region Private Command Event
         
         /// <summary>
-        /// Close all the expanded panels.
+        /// Close all the expanded panels.  
         /// </summary>
         private void ClearPanelState()
         {