Browse Source

PDFEdit(Windows) - 文字编辑隐藏显示设置下分屏界面

liyuxuan 1 year ago
parent
commit
91f9c5da15

+ 5 - 0
compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsControl/CPDFDisplaySettingsControl.xaml.cs

@@ -89,6 +89,11 @@ namespace compdfkit_tools.PDFControl
           
         }
 
+        public void SetSplitContainerVisibility(Visibility visible)
+        {
+            ViewModeUI?.SetSplitContainerVisibility(visible);
+        }
+
         private void PdfView_InfoChanged(object sender, KeyValuePair<string, object> e)
         {
             if (e.Key == "ActiveViewIndex")

+ 6 - 6
compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFViewModeUI.xaml

@@ -40,7 +40,7 @@
                 <RowDefinition Height="auto"></RowDefinition>
             </Grid.RowDefinitions>
 
-            <Border BorderThickness="0,0,0,1" BorderBrush="#EDEDED" Padding="0,0,0,7.5">
+            <Border BorderThickness="0,0,0,1" BorderBrush="#EDEDED" Padding="0,0,0,7.5" Name="SplitContainer">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"></RowDefinition>
@@ -49,11 +49,11 @@
                     <TextBlock Foreground="#43474D" FontSize="14" LineHeight="16" Margin="0,0,0,18">Split View</TextBlock>
                     
                     <StackPanel Orientation="Horizontal" Grid.Row="1">
-                        <!--水平视图-->
+                        <!--垂直视图-->
                         <ToggleButton Name="VerticalBtn" Width="50" Height="36" BorderThickness="0" Style="{StaticResource RoundToggleButtonStyle}" 
                                       Background="Transparent" Click="VerticalBtn_Click">
                             <ToggleButton.Content>
-                                <Path Name="HorizonPath" Fill="#999999" >
+                                <Path Name="VerticalPath" Fill="#999999" >
                                     <Path.Data>
                                         M20.5 0H0.5V14H20.5V0ZM4.34628 8.75L4.6731 7.73649H6.05023L6.37455 8.75H6.96333L5.66353 5H5.05979L3.76 8.75H4.34628ZM5.90054 7.26871H4.82279L5.33921 
                                         5.65748H5.38162L5.90054 7.26871ZM10 13V1H11V13H10ZM16.0694 7.69231C16.0694 8.34979 15.6078 8.75 14.8394 8.75H13.36V5H14.807C15.4831 5 15.8897 
@@ -65,11 +65,11 @@
                             </ToggleButton.Content>
                         </ToggleButton>
 
-                        <!--垂直视图-->
+                        <!--水平视图-->
                         <ToggleButton Name="HorizonBtn" Width="50" Height="36" BorderThickness="0" Margin="5,0,0,0" Style="{StaticResource RoundToggleButtonStyle}" 
                                       Background="Transparent" Click="HorizonBtn_Click">
                             <ToggleButton.Content>
-                                <Path Name="VerticalPath" Fill="#999999">
+                                <Path Name="HorizonPath" Fill="#999999">
                                     <Path.Data>
                                         M0.5 0V16H17.5V0H0.5ZM1 8.5H17V7.5H1V8.5ZM8.45114 5.23649L8.11071 6.25H7.5L8.85395 2.5H9.48285L10.8368 6.25H10.2235L9.88565 
                                         5.23649H8.45114ZM8.60707 4.76871H9.72973L9.18919 3.15748H9.14501L8.60707 4.76871ZM10.8222 12.3923C10.8222 13.0498 10.3415 13.45 
@@ -86,7 +86,7 @@
                 </Grid>
             </Border>
 
-            <Border Grid.Row="1" Margin="0,30,0,0">
+            <Border Name="DisplayContainer" Grid.Row="1" Margin="0,30,0,0">
                 <Grid>
                     <Grid.RowDefinitions>
                         <RowDefinition Height="auto"></RowDefinition>

+ 14 - 0
compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFDisplaySettings/PDFDisplaySettingsUI/CPDFViewModeUI.xaml.cs

@@ -227,5 +227,19 @@ namespace compdfkit_tools.PDFControlUI
         {
             CropModeBtn.IsChecked=isAutoCrop;
         }
+
+        public void SetSplitContainerVisibility(Visibility visibility)
+        {
+            SplitContainer.Visibility = visibility;
+            if (visibility == Visibility.Visible)
+            {
+                DisplayContainer.Margin = new Thickness(0,30,0,0);
+            }
+            else
+            {
+                DisplayContainer.Margin = new Thickness(0);
+            }
+          
+        }
     }
 }

+ 1 - 19
compdfkit_demo_windows/compdfkit/compdfkit-tools/PDFView/PDFViewControl/PDFViewControl.xaml.cs

@@ -27,28 +27,10 @@ namespace compdfkit_tools.PDFControl
         public CPDFViewer PDFView { get;private set; }
 
         private double[] zoomLevelList = { 1f, 8f, 12f, 25, 33f, 50, 66f, 75, 100, 125, 150, 200, 300, 400, 600, 800, 1000 };
+
         public PDFViewControl()
         {
             InitializeComponent();
-            InitializePDFView();
-        }
-
-        public void InitializePDFView(CPDFViewer newPDFView)
-        {
-            if(PDFView!=null)
-            {
-                PDFView.MouseWheelZoomHandler -= PDFView_MouseWheelZoomHandler;
-                PDFView.PDFActionHandler -= PDFView_PDFActionHandler;
-            }
-
-            PDFView = newPDFView;
-            Content = newPDFView;
-            PDFView.MouseWheelZoomHandler += PDFView_MouseWheelZoomHandler;
-            PDFView.PDFActionHandler += PDFView_PDFActionHandler;
-        }
-
-        private void InitializePDFView()
-        {
             PDFView = new CPDFViewer();
             Content = PDFView;
             PDFView.MouseWheelZoomHandler += PDFView_MouseWheelZoomHandler;

+ 1 - 0
compdfkit_demo_windows/compdfkit/edit-ctrl-demo/MainWindow.xaml.cs

@@ -499,6 +499,7 @@ namespace edit_ctrl_demo
                 if (toggleButton.IsChecked == true)
                 {
                     CPDFDisplaySettingsControl displayPanel = new CPDFDisplaySettingsControl();
+                    displayPanel.SetSplitContainerVisibility(Visibility.Collapsed);
                     displayPanel.InitWithPDFViewer(pdfViewControl.PDFView);
                     PropertyContainer.Child = displayPanel;
                     PropertyContainer.Visibility = Visibility.Visible;

BIN
compdfkit_demo_windows/compdfkit/edit-ctrl-demo/x64/ComPDFKit.dll


BIN
compdfkit_demo_windows/compdfkit/edit-ctrl-demo/x86/ComPDFKit.dll