merge

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

@@ -183,6 +183,12 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             set
             {
                 SetProperty(ref _relativeScaleValue, value);
+                WatermarkInfo.ImageSize=RelativeScaleValue;
+                eventAggregator.GetEvent<SetWatermarkEvent>().Publish(new WatermarkInfoUnicode
+                {
+                    Unicode = Unicode,
+                    Status = WatermarkInfo
+                });
             }
         }
 
@@ -516,6 +522,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
         {
 
             WatermarkInfo.Rotation = RotationValue;
+            WatermarkInfo.ImageSize=RelativeScaleValue;
             WatermarkInfo.Opacity = (byte)OpacityValue ;
             WatermarkInfo.VertOffset = float.Parse(VertOffsetValue);
             WatermarkInfo.HorizOffset = float.Parse(HorizOffsetValue);
@@ -582,6 +589,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     watermark.SetText(watermarkInfo.Text);
                     watermark.SetFontName(watermarkInfo.FontName);
                     watermark.SetFontSize(watermarkInfo.TextSize);
+                    //watermark.SetScale(watermarkInfo.TextSize);
                     watermark.SetTextRGBColor(watermarkInfo.TextColor);
                 }
                 else
@@ -591,9 +599,8 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     {
                         watermark.SetImage(watermarkInfo.ImageArray, watermarkInfo.ImageWidth, watermarkInfo.ImageHeight);
                     }
-                    watermark.SetScale(0.1f);
+                    watermark.SetScale(watermarkInfo.ImageSize/100);
                 }
-                watermark.SetScale(30f);
                 watermark.SetRotation((float)((watermarkInfo.Rotation / 180) * Math.PI));
                 watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 225));
                 watermark.SetFront(watermarkInfo.IsFront);
@@ -689,6 +696,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
             InitLocationButtonMatrix();
             CreateFileVisible=Visibility.Visible;
             IsFullValue = WatermarkInfo.Isfull;
+            RelativeScaleText = WatermarkInfo.ImageSize.ToString() + " %";
         }
 
         public void OpenFile()

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

@@ -754,7 +754,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     {
                         watermark.SetImage(watermarkInfo.ImageArray, watermarkInfo.ImageWidth, watermarkInfo.ImageHeight);
                     }
-                    watermark.SetScale(0.1f);
+                    watermark.SetScale(watermarkInfo.ImageSize / 100);
                 }
                 watermark.SetRotation((float)((watermarkInfo.Rotation / 180) * Math.PI));
                 watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity / 100) * 225));

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

@@ -189,7 +189,7 @@ namespace PDF_Office.ViewModels.EditTools.Watermark
                     {
                         watermark.SetImage(watermarkInfo.ImageArray, watermarkInfo.ImageWidth, watermarkInfo.ImageHeight);
                     }
-                    watermark.SetScale(0.1f);
+                    watermark.SetScale(watermarkInfo.ImageSize/100);
                 }
                 watermark.SetRotation((float)((watermarkInfo.Rotation / 180) *Math.PI ));
                 watermark.SetOpacity((byte)(((float)watermarkInfo.Opacity/ 100) * 225));

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

@@ -4,6 +4,7 @@
              xmlns:prism="http://prismlibrary.com/"             
              prism:ViewModelLocator.AutoWireViewModel="True"
              xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+             xmlns:convert="clr-namespace:PDF_Office.DataConvert"
              xmlns:i="http://schemas.microsoft.com/xaml/behaviors"
              xmlns:cus="clr-namespace:PDF_Office.CustomControl"
              xmlns:CompositeControl="clr-namespace:PDF_Office.CustomControl.CompositeControl"
@@ -11,6 +12,11 @@
              mc:Ignorable="d"
              d:DesignHeight="632"
              d:DesignWidth="260" >
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <convert:InvertBoolConvert x:Key="InvertBoolConvert"/>
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
         <Grid.RowDefinitions>
             <RowDefinition Height="168"/>
@@ -29,7 +35,7 @@
                 </TextBox>
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
                     <ComboBox Width="154" Height="32" SelectedIndex="{Binding FontNameSelectedIndex}" ItemsSource="{Binding FontNameList}"></ComboBox>
-                    <ComboBox Width="66" Height="32" Margin="8,0,0,0" ItemsSource="{Binding FontSizeList}" SelectedIndex="{Binding FontSizeSelectedIndex}"></ComboBox>
+                    <ComboBox Width="66" Height="32" Margin="8,0,0,0" ItemsSource="{Binding FontSizeList}" SelectedIndex="{Binding FontSizeSelectedIndex}" IsEnabled="{Binding ElementName=RelativeScaleCheckBox, Path=IsChecked, Converter={StaticResource InvertBoolConvert}}"></ComboBox>
                 </StackPanel>
                 <StackPanel Orientation="Horizontal" Margin="0,8,0,0">
                     <StackPanel Orientation="Horizontal">