fixes in brush editor

Author: jogibear9988

Src/Xceed.Wpf.Toolkit/BrushPicker/Implementation/ColorBox.cs

@@ -477,17 +477,17 @@ static void BrushChanged(DependencyObject property, DependencyPropertyChangedEve
                 }
                 else if (brush is SolidColorBrush)
                 {
-                    var fbrush = _wpfBrushTypes.First(x => x.Brush == brush);
-                    if (fbrush == null)
+                    var sbrush = (SolidColorBrush) brush;
+                    var fbrush = _wpfBrushTypes.FirstOrDefault(x => ((SolidColorBrush)x.Brush).Color == sbrush.Color);
+                    if (fbrush != null)
                     {
                         c.BrushType = BrushTypes.Predefined;
-                        //c.Color = (brush as SolidColorBrush).Color;
                     }
                     else
                     {
                         c.BrushType = BrushTypes.Solid;
-                        c.Color = (brush as SolidColorBrush).Color;
                     }
+                   c.Color = (brush as SolidColorBrush).Color;
                 }
                 else if (brush is LinearGradientBrush)
                 {
@@ -523,7 +523,7 @@ static void BrushChanged(DependencyObject property, DependencyPropertyChangedEve
 
                 c._BrushTypeSetInternally = false;
             }
-        }        
+        }
 
         public Color Color
         {
@@ -572,7 +572,7 @@ public static void OnColorChanged(DependencyObject o, DependencyPropertyChangedE
 
                     c._RGBSetInternally = false;
                 }
-                
+
                 c.RaiseColorChangedEvent((Color)e.NewValue);
             }
         }
@@ -781,8 +781,10 @@ internal void SetBrush()
 
             switch (BrushType)
             {
-                case BrushTypes.Predefined: return;
-                case BrushTypes.None: Brush = null; break;
+                case BrushTypes.Predefined:
+                  break;
+                case BrushTypes.None: Brush = null;
+                  break;
 
                 case BrushTypes.Solid:
                     Brush = new SolidColorBrush(this.Color);
@@ -800,7 +802,7 @@ internal void SetBrush()
                     brush.MappingMode = this.MappingMode;
                     brush.SpreadMethod = this.SpreadMethod;
                     Brush = brush;
-                    
+
                     break;
 
                 case BrushTypes.Radial:
@@ -821,7 +823,7 @@ internal void SetBrush()
                     break;
             }
 
-            if (this.BrushType != BrushTypes.None)
+            if (this.BrushType != BrushTypes.None && this.BrushType != BrushTypes.Predefined)
             {
                 this.Brush.Opacity = opacity;  // retain old opacity
                 if (tempTG != null)

Src/Xceed.Wpf.Toolkit/BrushPicker/Themes/Generic.xaml

@@ -210,11 +210,17 @@
                                                 </ControlTemplate>
                                             </Setter.Value>
                                         </Setter>
-                                    </Style>
+                                      <Setter Property="IsHitTestVisible" Value="True"/>
+                                      <Style.Triggers>
+                                        <DataTrigger Binding="{Binding ElementName=Popup, Path=IsOpen}" Value="True">
+                                          <Setter Property="IsHitTestVisible" Value="False"/>
+                                        </DataTrigger>
+                                      </Style.Triggers>
+                                     </Style>
                                 </ToggleButton.Style>
                             </ToggleButton>
 
-                            <Popup IsOpen="{Binding ElementName=PART_OpenPopup,Path=IsChecked}" StaysOpen="False" AllowsTransparency="True"                                   
+                            <Popup Name="Popup" IsOpen="{Binding ElementName=PART_OpenPopup, Path=IsChecked, Mode=TwoWay}" StaysOpen="False" AllowsTransparency="True"
                                    Width="{Binding ActualWidth, ElementName=PART_Root}"
                                    MinWidth="250"
                                    HorizontalOffset="-1">