部分颜色初始化

PDF Office/CustomControl/CompositeControl/ColorContent.xaml.cs

@@ -187,11 +187,7 @@ namespace PDF_Master.CustomControl.CompositeControl
                         control.ListColor.SelectedItem = item;
                         control.SelectedColor = colorItem;
                         if (control.ElcustomColor.Fill == null) { control.ElcustomColor.Fill = co; }
-                        {
-                          
-                           
-                        }
-                        
+                     
                         isFoundListItem = true;
                         break;
                     }

PDF Office/Model/AnnotPanel/AnnotCommon.cs

@@ -68,7 +68,7 @@ namespace PDF_Master.Model.AnnotPanel
         }
 
         //当前填充颜色
-        private Brush _currentFillColor = new SolidColorBrush(Colors.Transparent);
+        private Brush _currentFillColor = App.Current.FindResource("color.sys.layout.divider.text-date-fill") as Brush; 
 
         public Brush CurrentFillColor
         {
@@ -125,7 +125,7 @@ namespace PDF_Master.Model.AnnotPanel
         }
 
         //当前边框颜色
-        private Brush _currentBorderColor = new SolidColorBrush(Colors.Transparent);
+        private Brush _currentBorderColor = App.Current.FindResource("color.sys.layout.divider.shapes-border") as Brush;
 
         public Brush CurrentBorderColor
         {
@@ -142,7 +142,7 @@ namespace PDF_Master.Model.AnnotPanel
         }
 
         //当前边框颜色
-        private Brush _currentFontColor ;
+        private Brush _currentFontColor=App.Current.FindResource("color.sys.layout.divider.pen") as Brush;
 
         public Brush CurrentFontColor
         {

PDF Office/ViewModels/PropertyPanel/AnnotPanel/StickyNotePropertyViewModel.cs

@@ -51,7 +51,7 @@ namespace PDF_Master.ViewModels.PropertyPanel.AnnotPanel
             set { SetProperty(ref _sharpColor, value); SharpCurrentColor = _sharpColor; }
         }
 
-        private Brush _sharpCurrentColor;
+        private Brush _sharpCurrentColor= App.Current.FindResource("color.sys.layout.divider.note") as Brush;
 
         public Brush SharpCurrentColor
         {