merge

PDF Office/ViewModels/EditTools/Background/BackgroundCreateColorContentViewModel.cs

@@ -268,16 +268,19 @@ namespace PDF_Office.ViewModels.EditTools.Background
 
         public void ConvertInfoToItem(ref BackgroundItem backgroundItem, BackgroundInfo backgroundInfo)
         {
-            backgroundItem.type = backgroundInfo.BackgroundType;
-            backgroundItem.bgColor = backgroundInfo.Color;
-            backgroundItem.horizalign = backgroundInfo.Horizalign;
-            backgroundItem.vertalign = backgroundInfo.Vertalign;
-            backgroundItem.vertOffset = backgroundInfo.VertOffset;
-            backgroundItem.horizalign = backgroundInfo.Horizalign;
-            backgroundItem.opacity = backgroundInfo.Opacity;
-            backgroundItem.rotation = backgroundInfo.Rotation;
-            backgroundItem.scale = backgroundInfo.Scale;
-            backgroundItem.pageRange = backgroundInfo.PageRange;
+            if (backgroundItem != null)
+            {
+                backgroundItem.type = backgroundInfo.BackgroundType;
+                backgroundItem.bgColor = backgroundInfo.Color;
+                backgroundItem.horizalign = backgroundInfo.Horizalign;
+                backgroundItem.vertalign = backgroundInfo.Vertalign;
+                backgroundItem.vertOffset = backgroundInfo.VertOffset;
+                backgroundItem.horizalign = backgroundInfo.Horizalign;
+                backgroundItem.opacity = backgroundInfo.Opacity;
+                backgroundItem.rotation = backgroundInfo.Rotation;
+                backgroundItem.scale = backgroundInfo.Scale;
+                backgroundItem.pageRange = backgroundInfo.PageRange;
+            }
             //  backgroundItem.pagRangeMode = backgroundInfo.PageRange;
         }
 
@@ -289,7 +292,6 @@ namespace PDF_Office.ViewModels.EditTools.Background
             Settings.Default.BackgroundTemplateList.Add(backgroundItem);
             Settings.Default.Save();
             this.eventAggregator.GetEvent<EnterTemplateListOrCreateEvent>().Publish(EnumTemplateListOrCreate.StatusTemplate);
-
         }
 
         /// <summary>

PDF Office/ViewModels/EditTools/Background/BackgroundTemplateListFileContentViewModel.cs

@@ -157,18 +157,21 @@ namespace PDF_Office.ViewModels.EditTools.Background
 
         public void ConvertItemToInfo(BackgroundItem backgroundItem, ref BackgroundInfo backgroundInfo)
         {
-            backgroundInfo.BackgroundType = backgroundItem.type ;
-            backgroundInfo.ImageArray = backgroundItem.imageArray;
-            backgroundInfo.ImageWidth = backgroundItem.imageWidth;
-            backgroundInfo.ImageHeight = backgroundItem.imageHeight;
-            backgroundInfo.Horizalign = backgroundItem.horizalign;
-            backgroundInfo.Vertalign = backgroundItem.vertalign;
-            backgroundInfo.VertOffset = backgroundItem.vertOffset;
-            backgroundInfo.Horizalign = backgroundItem.horizalign;
-            backgroundInfo.Opacity = backgroundItem.opacity;
-            backgroundInfo.Rotation = backgroundItem.rotation;
-            backgroundInfo.Scale = backgroundItem.scale;
-            backgroundInfo.PageRange = backgroundItem.pageRange;
+            if(backgroundItem!=null)
+            {
+                backgroundInfo.BackgroundType = backgroundItem.type;
+                backgroundInfo.ImageArray = backgroundItem.imageArray;
+                backgroundInfo.ImageWidth = backgroundItem.imageWidth;
+                backgroundInfo.ImageHeight = backgroundItem.imageHeight;
+                backgroundInfo.Horizalign = backgroundItem.horizalign;
+                backgroundInfo.Vertalign = backgroundItem.vertalign;
+                backgroundInfo.VertOffset = backgroundItem.vertOffset;
+                backgroundInfo.Horizalign = backgroundItem.horizalign;
+                backgroundInfo.Opacity = backgroundItem.opacity;
+                backgroundInfo.Rotation = backgroundItem.rotation;
+                backgroundInfo.Scale = backgroundItem.scale;
+                backgroundInfo.PageRange = backgroundItem.pageRange;
+            }
             //  backgroundItem.pagRangeMode = backgroundInfo.PageRange;
         }
 

PDF Office/Views/EditTools/Background/BackgroundTemplateListColorContent.xaml

@@ -41,8 +41,10 @@
                            SelectionChanged="ListBox_SelectionChanged">
             <ListBox.ItemContainerStyle>
                 <Style TargetType="ListBoxItem">
-                    <Setter Property="Margin" Value="0"/>
-                    <Setter Property="Padding" Value="8 0 8 0"/>
+                    <Setter Property="Margin" Value="20"/>
+                    <Setter Property="Padding" Value="0 0 0 0"/>
+                    <Setter Property="Height" Value="160"/>
+                    <Setter Property="Width" Value="128"/>
                     <Setter Property="ContextMenu" Value="{StaticResource FlyoutMenu}"/>
                     <Setter Property="Template" Value="{DynamicResource EditToolsItemControlTemplate}"/>
                 </Style>