Browse Source

颜色控件支持点击

liyijie 1 year ago
parent
commit
5df5421377

+ 1 - 1
PDF Office/CustomControl/CompositeControl/ColorContent.xaml

@@ -120,7 +120,7 @@
             CornerRadius="4">
             
                 <StackPanel Orientation="Horizontal">
-                <Grid     Margin="4,0">
+                <Grid     Margin="4,0" MouseDown="Grid_MouseDown">
                     <Ellipse
                     x:Name="defaultColor"
                    

+ 25 - 3
PDF Office/CustomControl/CompositeControl/ColorContent.xaml.cs

@@ -355,8 +355,30 @@ namespace PDF_Master.CustomControl.CompositeControl
             }
 
             return isSelectList;
-        }
-
-      
+        }
+
+        private void Grid_MouseDown(object sender, MouseButtonEventArgs e)
+        {
+
+            if (ElcustomColor.Fill == null)
+            {
+                ElcustomColor.Fill = new SolidColorBrush(Colors.Transparent);
+            }
+            Color ecolor=new Color();
+            if (defaultColor.Visibility == Visibility.Visible)
+            {
+                ecolor = (defaultColor.Fill as SolidColorBrush).Color;
+            }
+            else {
+                ecolor = (ElcustomColor.Fill as SolidColorBrush).Color;
+            }
+            
+            IsExistForContainer((ElcustomColor.Fill as SolidColorBrush).Color);
+            SelectedColorHandler?.Invoke(this, ecolor);
+            ElcustomColor.Fill = new SolidColorBrush(ecolor);
+            SelectedColor = ecolor;
+            SelectedColorInvoke?.Invoke(ecolor, null);
+            DefaultColorInvoke?.Invoke(ecolor, null);
+        }
     }
 }