Merge branch 'dev' of http://git.kdan.cc:8865/Windows/PDFOffice_Windows_exe into dev

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

@@ -165,6 +165,7 @@ namespace PDF_Master.CustomControl.CompositeControl
                     if (colorItem.A == co.Color.A && colorItem.G == co.Color.G && colorItem.B == co.Color.B && colorItem.R == co.Color.R)
                     {
                         control.ListColor.SelectedItem = item;
+                        control.SelectedColor = colorItem;
                         //control.ElcustomColor.Fill = new SolidColorBrush(Colors.Transparent);
                         isFoundListItem = true;
                         break;