Преглед изворни кода

compdfkit(win) - 单一模块交互问题

liuaoran пре 1 година
родитељ
комит
7259cd2f7a
1 измењених фајлова са 19 додато и 14 уклоњено
  1. 19 14
      Demo/Examples/ContentEditor/MainWindow.xaml.cs

+ 19 - 14
Demo/Examples/ContentEditor/MainWindow.xaml.cs

@@ -87,6 +87,7 @@ namespace ContentEditor
 
         private PDFEditEvent pdfTextCreateParam;
 
+
         #endregion
 
         public MainWindow()
@@ -712,8 +713,15 @@ namespace ContentEditor
                 if (toggleButton.IsChecked == true)
                 {
                     CPDFDisplaySettingsControl displayPanel = new CPDFDisplaySettingsControl();
-                    displayPanel.SetVisibilityWhenContentEdit(Visibility.Collapsed);
                     displayPanel.InitWithPDFViewer(pdfViewControl.PDFView);
+                    if (ViewComboBox.SelectedIndex == 1)
+                    {
+                        displayPanel.SetVisibilityWhenContentEdit(Visibility.Collapsed);
+                    }
+                    else
+                    {
+                        displayPanel.SetVisibilityWhenContentEdit(Visibility.Visible);
+                    }
                     prevPanel = PropertyContainer.Child;
                     PropertyContainer.Child = displayPanel;
                     PropertyContainer.Visibility = Visibility.Visible;
@@ -878,7 +886,7 @@ namespace ContentEditor
                     if (PropertyContainer.Child != null && !(bool)ViewSettingBtn.IsChecked)
                     {
                         PropertyContainer.Child = empytPanel;
-                        PropertyContainer.Visibility = Visibility.Collapsed; 
+                        PropertyContainer.Visibility = Visibility.Collapsed;
                     }
                     pdfViewControl.PDFView?.SetPDFEditCreateType(CPDFEditType.EditImage);
                     pdfViewControl.PDFView?.AddPDFEditImage(openFileDialog.FileName);
@@ -1086,18 +1094,8 @@ namespace ContentEditor
                     pdfViewControl.PDFView?.SetPDFEditType(CPDFEditType.None);
                     pdfViewControl.PDFView?.SetMouseMode(MouseModes.Viewer);
                     pdfViewControl.PDFView?.ReloadDocument();
-                    if (!(bool)ViewSettingBtn.IsChecked)
-                    {
-                        RightPanelBtn.IsChecked = false;
-                        PropertyContainer.Visibility = Visibility.Collapsed;
-                        if (PropertyContainer != null)
-                        {
-                            PropertyContainer.Child = null;
-                        }
-                    }
-                    return;
-                }
-
+                   
+                } 
                 if (ViewComboBox.SelectedIndex == 1)
                 {
                     PDFEditTool.Visibility = Visibility.Visible;
@@ -1107,6 +1105,13 @@ namespace ContentEditor
                     pdfViewControl.PDFView?.SetMouseMode(MouseModes.PDFEdit);
                     pdfViewControl.PDFView?.ReloadDocument();
                 }
+                RightPanelBtn.IsChecked = false;
+                ViewSettingBtn.IsChecked = false;
+                PropertyContainer.Visibility = Visibility.Collapsed;
+                if (PropertyContainer != null)
+                {
+                    PropertyContainer.Child = null;
+                }
             }
         }