merge

PDF Office/CustomControl/CommonWritableComboBox.xaml

@@ -6,6 +6,27 @@
              xmlns:local="clr-namespace:PDF_Office.CustomControl"
              mc:Ignorable="d" 
               d:DesignHeight="32" d:DesignWidth="66">
+    <UserControl.Resources>
+        <Style x:Key="PagesView_txtContext" TargetType="{x:Type TextBox}">
+            <Setter Property="Template">
+                <Setter.Value>
+                    <ControlTemplate TargetType="{x:Type TextBox}">
+                        <Border x:Name="Bd" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}"
+                                    Background="{TemplateBinding Background}" SnapsToDevicePixels="True">
+                            <ScrollViewer x:Name="PART_ContentHost"/>
+                        </Border>
+                        <ControlTemplate.Triggers>
+                            <Trigger Property="IsEnabled" Value="false">
+                                <Setter Property="Background" TargetName="Bd" Value="{DynamicResource {x:Static SystemColors.ControlBrushKey}}"/>
+                                <Setter Property="Foreground" Value="{DynamicResource {x:Static SystemColors.GrayTextBrushKey}}"/>
+                            </Trigger>
+                        </ControlTemplate.Triggers>
+                    </ControlTemplate>
+                </Setter.Value>
+            </Setter>
+        </Style>
+    </UserControl.Resources>
+    
     <Border CornerRadius="1" BorderBrush="Black" BorderThickness="1,1,1,1" Panel.ZIndex="2">
     <Grid>
         <Grid.ColumnDefinitions>
@@ -28,10 +49,12 @@
                 TextAlignment="Left"
                 KeyDown="CurrentPage_KeyDown"
                 TextChanged="TextBox_Num_TextChanged"
-                 Panel.ZIndex="1">
+                 Panel.ZIndex="1"
+                 Style="{StaticResource PagesView_txtContext}">
          
             </TextBox>
-        <ComboBox Name="ComboBox_Type" MinHeight="28" MinWidth="64" HorizontalAlignment="Right" BorderThickness="00" Background="#F3F3F3" Grid.Column="0" Grid.ColumnSpan="2" SelectionChanged="ComboBox_SelectionChanged" ItemsSource="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CommonWritableComboBox}, Path=TypeSouce}" Panel.ZIndex="0">
+        <ComboBox Name="ComboBox_Type" MinHeight="28" MinWidth="64" HorizontalAlignment="Right" BorderThickness="00" Background="#F3F3F3" Grid.Column="0" Grid.ColumnSpan="2" SelectionChanged="ComboBox_SelectionChanged" ItemsSource="{Binding RelativeSource={RelativeSource Mode=FindAncestor, AncestorType=local:CommonWritableComboBox}, Path=TypeSouce}" Panel.ZIndex="0"
+                  >
         </ComboBox>
 
     </Grid>

PDF Office/Model/EditTools/Watermark/WatermarkCreateModel.cs

@@ -129,5 +129,10 @@ namespace PDF_Office.Model.EditTools.Watermark
         /// </summary>
         public bool IsFront = false;
 
+        /// <summary>
+        /// 水印是否自适应比例;
+        /// </summary>
+        public bool IsRelativeScale = false;
+
     }
 }

PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateFileContentViewModel.cs

@@ -288,6 +288,22 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             }
         }
 
+        private bool _isRelativeScaleValue = false;
+        public bool IsRelativeScaleValue
+        {
+            get { return _isRelativeScaleValue; }
+            set
+            {
+                SetProperty(ref _isRelativeScaleValue, value);
+                WatermarkInfo.IsRelativeScale = IsRelativeScaleValue;
+                eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
+                {
+                    Unicode = Unicode,
+                    Status = WatermarkInfo
+                });
+            }
+        }
+
         private int _pageRangeSelectIndex = 0;
         public int PageRangeSelectIndex
         {
@@ -388,6 +404,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 watermarkItem.imageHeight = watermarkInfo.ImageHeight;
                 watermarkItem.horizalign = watermarkInfo.WatermarkHorizalign;
                 watermarkItem.vertalign = watermarkInfo.WatermarkVertalign;
+                watermarkItem.isRelativeScale = watermarkInfo.IsRelativeScale;
                 watermarkItem.isFullScreen = watermarkInfo.Isfull;
                 watermarkItem.isfront = watermarkInfo.IsFront;
                 watermarkItem.opacity = watermarkInfo.Opacity;
@@ -428,6 +445,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 }
                 watermarkInfo.WatermarkHorizalign = watermarkItem.horizalign;
                 watermarkInfo.WatermarkVertalign = watermarkItem.vertalign;
+                watermarkInfo.IsRelativeScale = watermarkItem.isRelativeScale;
                 watermarkInfo.Isfull = watermarkItem.isFullScreen;
                 watermarkInfo.IsFront = watermarkItem.isfront;
                 watermarkInfo.ImageSize = watermarkItem.imageSize;
@@ -530,6 +548,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             WatermarkInfo.HorizontalSpacing = float.Parse(HorizontalSpacingValue);
             WatermarkInfo.WatermarkHorizalign = C_Watermark_Horizalign.WATERMARK_HORIZALIGN_CENTER;
             WatermarkInfo.WatermarkVertalign = C_Watermark_Vertalign.WATERMARK_VERTALIGN_CENTER;
+            WatermarkInfo.IsRelativeScale = IsRelativeScaleValue;
             WatermarkInfo.Isfull = IsFullValue;
             SetIsFront(IsFrontSelectedIndex);
         }
@@ -602,7 +621,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     watermark.SetScale(watermarkInfo.ImageSize/100);
                 }
                 watermark.SetRotation((float)((watermarkInfo.Rotation / 180) * Math.PI));
-                watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 225));
+                watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 255));
                 watermark.SetFront(watermarkInfo.IsFront);
                 watermark.SetVertalign(watermarkInfo.WatermarkVertalign);
                 watermark.SetHorizalign(watermarkInfo.WatermarkHorizalign);
@@ -695,6 +714,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             RelativeScaleText = WatermarkInfo.TextSize.ToString() + " %";
             InitLocationButtonMatrix();
             CreateFileVisible=Visibility.Visible;
+            IsRelativeScaleValue = WatermarkInfo.IsRelativeScale;
             IsFullValue = WatermarkInfo.Isfull;
             RelativeScaleText = WatermarkInfo.ImageSize.ToString() + " %";
         }

PDF Office/ViewModels/EditTools/Watermark/WatermarkCreateTextContentViewModel.cs

@@ -368,6 +368,23 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 });
             }
         }
+
+        private bool _isRelativeScaleValue = false;
+        public bool IsRelativeScaleValue
+        {
+            get { return _isRelativeScaleValue; }
+            set
+            {
+                SetProperty(ref _isRelativeScaleValue, value);
+                WatermarkInfo.IsRelativeScale = IsRelativeScaleValue;
+                eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
+                {
+                    Unicode = Unicode,
+                    Status = WatermarkInfo
+                });
+            }
+        }
+
         private SolidColorBrush _solidColorBrush = null;
         public SolidColorBrush SolidColorBrush
         {
@@ -486,6 +503,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 watermarkItem.horizalign = watermarkInfo.WatermarkHorizalign;
                 watermarkItem.vertalign = watermarkInfo.WatermarkVertalign;
                 watermarkItem.isFullScreen = watermarkInfo.Isfull;
+                watermarkItem.isRelativeScale = watermarkInfo.IsRelativeScale;
                 watermarkItem.isfront = watermarkInfo.IsFront;
                 watermarkItem.opacity = watermarkInfo.Opacity;
                 watermarkItem.rotation = watermarkInfo.Rotation;
@@ -509,6 +527,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 watermarkInfo.TextColor = watermarkItem.textcolor;
                 watermarkInfo.WatermarkHorizalign = watermarkItem.horizalign;
                 watermarkInfo.WatermarkVertalign = watermarkItem.vertalign;
+                watermarkInfo.IsRelativeScale=watermarkItem.isRelativeScale;
                 watermarkInfo.Isfull = watermarkItem.isFullScreen;
                 watermarkInfo.IsFront = watermarkItem.isfront;
                 watermarkInfo.Opacity = watermarkItem.opacity;
@@ -704,6 +723,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             WatermarkInfo.HorizontalSpacing = float.Parse(HorizontalSpacingValue);
             WatermarkInfo.WatermarkHorizalign = C_Watermark_Horizalign.WATERMARK_HORIZALIGN_CENTER;
             WatermarkInfo.WatermarkVertalign = C_Watermark_Vertalign.WATERMARK_VERTALIGN_CENTER;
+            WatermarkInfo.IsRelativeScale = IsRelativeScaleValue;
             WatermarkInfo.Isfull = IsFullValue;
             SetFontName(FontNameSelectedIndex);
             SetFontSize(FontSizeSelectedIndex);
@@ -730,6 +750,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             OpacityText = WatermarkInfo.Opacity.ToString() + " %";
             RelativeScaleText = WatermarkInfo.TextSize.ToString() + " %";
             IsFullValue = WatermarkInfo.Isfull;
+            IsRelativeScaleValue = WatermarkInfo.IsRelativeScale;
             InitLocationButtonMatrix();
 
         }
@@ -757,7 +778,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     watermark.SetScale(watermarkInfo.ImageSize / 100);
                 }
                 watermark.SetRotation((float)((watermarkInfo.Rotation / 180) * Math.PI));
-                watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 225));
+                watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 255));
                 watermark.SetFront(watermarkInfo.IsFront);
                 watermark.SetVertalign(watermarkInfo.WatermarkVertalign);
                 watermark.SetHorizalign(watermarkInfo.WatermarkHorizalign);

PDF Office/ViewModels/EditTools/Watermark/WatermarkDocumentContentViewModel.cs

@@ -116,7 +116,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 {
                     return;
                 }
-                if (int.Parse(args.Text) > 0 && int.Parse(args.Text) <= PDFViewer.Document.PageCount )
+                if (int.Parse(args.Text) > 0 && int.Parse(args.Text) <= PDFViewer.Document.PageCount)
                 {
                     PDFViewer.GoToPage(int.Parse(args.Text) - 1);
                     InputIndexBoxVisible = Visibility.Collapsed;
@@ -130,39 +130,45 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             {
                 viewContentViewModel.PDFViewer.Document.DeleteWatermarks();
             }
-
-            if (watermarkInfo != null)
+            else
             {
-
-                if (EnumDelete == EnumDelete.StatusDeleteInitial)
+                if (watermarkInfo != null)
                 {
-                    viewContentViewModel.PDFViewer.Document.DeleteWatermarks();
-                    CreateWatermark(viewContentViewModel.PDFViewer.Document);
-                }
-                else
-                {
-                    CreateWatermark(viewContentViewModel.PDFViewer.Document);
+
+                    if (EnumDelete == EnumDelete.StatusDeleteInitial)
+                    {
+                        viewContentViewModel.PDFViewer.Document.DeleteWatermarks();
+                        CreateWatermark(viewContentViewModel.PDFViewer.Document);
+                    }
+                    else
+                    {
+                        CreateWatermark(viewContentViewModel.PDFViewer.Document);
+                    }
                 }
-                viewContentViewModel.PDFViewer.UndoManager.CanSave = true;
             }
+            viewContentViewModel.PDFViewer.UndoManager.CanSave = true;
         }
 
         public void DeleteWatermark(EnumDeleteUnicode enumDeleteunicode)
         {
-            EnumDelete enumDelete = enumDeleteunicode.Status;
-            EnumDelete = enumDelete;
-            PDFViewer.Document.DeleteWatermarks();
-            PDFViewer.Document.ReleasePages();
-            PDFViewer.ReloadDocument();
+            if (EnumDelete == EnumDelete.StatusDeleteAll)
+            {
+                EnumDelete enumDelete = enumDeleteunicode.Status;
+                EnumDelete = enumDelete;
+                PDFViewer.Document.DeleteWatermarks();
+                PDFViewer.Document.ReleasePages();
+                PDFViewer.ReloadDocument();
+            }
         }
 
         public void SetWatermark(WatermarkInfoUnicode watermarkInfounicode)
         {
             WatermarkInfo watermarkInfo = watermarkInfounicode.Status;
             this.watermarkInfo = watermarkInfo;
+            EnumDelete = EnumDelete.StatusCreate;
             //CreateWatermark(viewContentViewModel.PDFViewer.Document);
             // PDFViewer.Document.PdfToImage("0-1", "C:\\Users\\kdanmobile\\Desktop\\888\\");
-            viewContentViewModel.PDFViewer.Document.WriteToFilePath("C:\\Users\\kdanmobile\\Desktop\\888\\sb22222_.pdf");
+            //viewContentViewModel.PDFViewer.Document.WriteToFilePath("C:\\Users\\kdanmobile\\Desktop\\888\\sb22222_.pdf");
             PDFViewer.InvalidChildVisual(false);
 
         }
@@ -189,10 +195,10 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     {
                         watermark.SetImage(watermarkInfo.ImageArray, watermarkInfo.ImageWidth, watermarkInfo.ImageHeight);
                     }
-                    watermark.SetScale(watermarkInfo.ImageSize/100);
+                    watermark.SetScale(watermarkInfo.ImageSize / 100);
                 }
-                watermark.SetRotation((float)((watermarkInfo.Rotation / 180) *Math.PI ));
-                watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity/ 100) * 225));
+                watermark.SetRotation((float)((watermarkInfo.Rotation / 180) * Math.PI));
+                watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 255));
                 watermark.SetFront(watermarkInfo.IsFront);
                 watermark.SetVertalign(watermarkInfo.WatermarkVertalign);
                 watermark.SetHorizalign(watermarkInfo.WatermarkHorizalign);
@@ -261,10 +267,10 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             CreateWatermark(newDoc, true);
             CPDFPage newPage = newDoc.PageAtIndex(0);
             double scale = 96.0 / 72.0;
-            zoom =   zoom * 1.5;
+            zoom = zoom * 1.5;
             Rect renderRect = new Rect(0, 0, (int)(pageSize.Width * scale), (int)(pageSize.Height * scale));
             byte[] imageArray = new byte[(int)(renderRect.Width * renderRect.Height * 4)];
-            newPage.RenderPageBitmapWithMatrix(1/(float)zoom, renderRect, 0x00FFFFFF, imageArray, 1, true);
+            newPage.RenderPageBitmapWithMatrix(1 / (float)zoom, renderRect, 0x00FFFFFF, imageArray, 1, true);
             WriteableBitmap WirteBitmap = new WriteableBitmap((int)renderRect.Width, (int)renderRect.Height, 96, 96, PixelFormats.Bgra32, null);
             WirteBitmap.WritePixels(new Int32Rect(0, 0, (int)renderRect.Width, (int)renderRect.Height), imageArray, WirteBitmap.BackBufferStride, 0);
             return WirteBitmap;

PDF Office/ViewModels/EditTools/Watermark/WatermarkTemplateListFileContentViewModel.cs

@@ -263,6 +263,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 }
                 watermarkInfo.WatermarkHorizalign = watermarkItem.horizalign;
                 watermarkInfo.WatermarkVertalign = watermarkItem.vertalign;
+                watermarkInfo.IsRelativeScale = watermarkItem.isRelativeScale;
                 watermarkInfo.Isfull = watermarkItem.isFullScreen;
                 watermarkInfo.IsFront = watermarkItem.isfront;
                 watermarkInfo.ImageSize = watermarkItem.imageSize;

PDF Office/ViewModels/EditTools/Watermark/WatermarkTemplateListTextContentViewModel.cs

@@ -231,6 +231,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                 watermarkInfo.TextColor = watermarkItem.textcolor;
                 watermarkInfo.WatermarkHorizalign = watermarkItem.horizalign;
                 watermarkInfo.WatermarkVertalign = watermarkItem.vertalign;
+                watermarkInfo.IsRelativeScale = watermarkItem.isRelativeScale;
                 watermarkInfo.Isfull = watermarkItem.isFullScreen;
                 watermarkInfo.IsFront = watermarkItem.isfront;
                 watermarkInfo.Opacity = watermarkItem.opacity;

PDF Office/Views/EditTools/Watermark/WatermarkCreateFileContent.xaml

@@ -9,6 +9,13 @@
              mc:Ignorable="d"
              d:DesignHeight="632"
              d:DesignWidth="260" >
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../../../Styles/CheckBoxStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="48"/>
@@ -22,7 +29,7 @@
         </Grid>
         <Grid Grid.Row="1" Visibility="{Binding CreateFileVisible}">
             <Grid.RowDefinitions>
-                <RowDefinition Height="197"/>
+                <RowDefinition Height="199"/>
                 <RowDefinition Height="200"/>
                 <RowDefinition Height="*"/>
             </Grid.RowDefinitions>
@@ -40,13 +47,13 @@
                         </StackPanel>
                     </StackPanel>
                     <ComboBox Height="32" Margin="0,8,0,0" ItemsSource="{Binding IsFrontList}" SelectedIndex="{Binding IsFrontSelectedIndex}"></ComboBox>
-                    <CheckBox Margin="0,11,0,0" Name="RelativeScaleCheckBox">
-                        <TextBlock Text="相对于页面目标的比例" Width="144" Height="22" FontSize="14"/>
+                    <CheckBox Style="{StaticResource EditToolsCheckBoxStyle}" Content="相对目标页面的比例" Margin="0,11,0,0" Name="RelativeScaleCheckBox" IsChecked="{Binding IsRelativeScaleValue}">
+                       
                     </CheckBox>
                     <cus:CommonWritableComboBox Width="66" Height="32" HorizontalAlignment="Left" Margin="0,9,0,0" TypeSouce="{Binding ScaleList}" IsEnabled="{Binding ElementName=RelativeScaleCheckBox,Path=IsChecked}" Text="{Binding RelativeScaleText,Mode=TwoWay}" Value="{Binding RelativeScaleValue,Mode=TwoWay}"></cus:CommonWritableComboBox>
                 </StackPanel>
             </Grid>
-            <Grid  Grid.Row="1"  Margin="16,10,16,0" Width="228">
+            <Grid  Grid.Row="1"  Margin="16,8,16,0" Width="228">
                 <StackPanel>
                     <TextBlock Text="位置" FontSize="12" Foreground="#666666" Height="20" Width="24" HorizontalAlignment="Left"></TextBlock>
                     <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
@@ -83,8 +90,7 @@
                         </StackPanel>
 
                     </StackPanel>
-                    <CheckBox Margin="0,24,0,0" Name="IsFullCheckBox" IsChecked="{Binding IsFullValue}">
-                        <TextBlock Text="平铺" Width="144" Height="22" FontSize="14"/>
+                    <CheckBox Style="{StaticResource EditToolsCheckBoxStyle}" Content="平铺" Margin="0,24,0,0" Name="IsFullCheckBox" IsChecked="{Binding IsFullValue}">
                     </CheckBox>
                     <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
                         <StackPanel Orientation="Horizontal">

PDF Office/Views/EditTools/Watermark/WatermarkCreateTextContent.xaml

@@ -15,12 +15,15 @@
     <UserControl.Resources>
         <ResourceDictionary>
             <convert:InvertBoolConvert x:Key="InvertBoolConvert"/>
+            <ResourceDictionary.MergedDictionaries>
+                <ResourceDictionary Source="../../../Styles/CheckBoxStyle.xaml"/>
+            </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="168"/>
-            <RowDefinition Height="190"/>
+            <RowDefinition Height="192"/>
             <RowDefinition Height="200"/>
             <RowDefinition Height="*"/>
         </Grid.RowDefinitions>
@@ -63,13 +66,12 @@
                     </StackPanel>
                 </StackPanel>
                 <ComboBox Height="32" Margin="0,8,0,0" ItemsSource="{Binding IsFrontList}" SelectedIndex="{Binding IsFrontSelectedIndex}"></ComboBox>
-                <CheckBox Margin="0,11,0,0" Name="RelativeScaleCheckBox">
-                    <TextBlock Text="相对于页面目标的比例" Width="144" Height="22" FontSize="14"/>
+                <CheckBox Style="{StaticResource EditToolsCheckBoxStyle}" Content="相对目标页面的比例" Margin="0,11,0,0" Name="RelativeScaleCheckBox" IsChecked="{Binding IsRelativeScaleValue}">
                 </CheckBox>
                 <cus:CommonWritableComboBox Width="66" Height="32" HorizontalAlignment="Left" Margin="0,9,0,0" TypeSouce="{Binding ScaleList,Mode=TwoWay}" IsEnabled="{Binding ElementName=RelativeScaleCheckBox,Path=IsChecked}" Text="{Binding RelativeScaleText,Mode=TwoWay}" Value="{Binding RelativeScaleValue,Mode=TwoWay}"></cus:CommonWritableComboBox>
             </StackPanel>
         </Grid>
-        <Grid  Grid.Row="2"  Margin="0,10,0,0" Width="228">
+        <Grid  Grid.Row="2"  Margin="0,8,0,0" Width="228">
             <StackPanel>
                 <TextBlock Text="位置" FontSize="12" Foreground="#666666" Height="20" Width="48" HorizontalAlignment="Left"></TextBlock>
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
@@ -106,8 +108,7 @@
                     </StackPanel>
                     
                 </StackPanel>
-                <CheckBox Margin="0,24,0,0" Name="IsFullCheckBox" IsChecked="{Binding IsFullValue}">
-                    <TextBlock Text="平铺" Width="144" Height="22" FontSize="14"/>
+                <CheckBox Style="{StaticResource EditToolsCheckBoxStyle}" Content="平铺" Margin="0,24,0,0" Name="IsFullCheckBox" IsChecked="{Binding IsFullValue}">
                 </CheckBox>
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
                     <StackPanel Orientation="Horizontal">

PDFSettings/WatermarkTemplateList.cs

@@ -156,5 +156,10 @@ namespace PDFSettings
         /// 页面选择的范围 ALL ODD EVEN 1-5(传入用户输入的字符串)
         /// </summary>
         public string pageangeMode = "ALL";
+
+        /// <summary>
+        /// 水印是否自适应比例;
+        /// </summary>
+        public bool isRelativeScale = false;
     }
 }