Merge branch 'develop' into main

MahApps · Dec 6, 2020 · 272e559 · 272e559
2 parents 1377831 + 8507c2a
commit 272e559
Show file tree

Hide file tree

Showing 3 changed files with 3 additions and 7 deletions.
diff --git a/src/MahApps.Metro/Themes/ColorPicker/ColorEyeDropper.xaml b/src/MahApps.Metro/Themes/ColorPicker/ColorEyeDropper.xaml
@@ -7,7 +7,7 @@
                     xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
                     mc:Ignorable="po d">
 
-    <Cursor x:Key="MahApps.Cursors.EyeDropper">../../Assets/Eyedropper.cur</Cursor>
+    <Cursor x:Key="MahApps.Cursors.EyeDropper">pack://application:,,,/MahApps.Metro;component/Assets/Eyedropper.cur</Cursor>
 
     <Style x:Key="MahApps.Styles.ColorEyeDropper"
            BasedOn="{StaticResource {x:Type Button}}"

diff --git a/src/MahApps.Metro/Themes/ColorPicker/ColorPalette.xaml b/src/MahApps.Metro/Themes/ColorPicker/ColorPalette.xaml
@@ -14,7 +14,6 @@
     <Style x:Key="MahApps.Styles.ListBoxItem.ColorPaletteItem"
            BasedOn="{StaticResource MahApps.Styles.ListBoxItem}"
            TargetType="{x:Type ListBoxItem}">
-        <Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
         <Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Control.Border}" />
         <Setter Property="BorderThickness" Value="1" />
         <Setter Property="MinHeight" Value="1" />

diff --git a/src/MahApps.Metro/Themes/ColorPicker/ColorPicker.xaml b/src/MahApps.Metro/Themes/ColorPicker/ColorPicker.xaml
@@ -2,16 +2,12 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controlzex="urn:controlzex"
                     xmlns:converters="clr-namespace:MahApps.Metro.Converters"
-                    xmlns:mah="clr-namespace:MahApps.Metro.Controls"
-                    xmlns:system="clr-namespace:System;assembly=mscorlib">
+                    xmlns:mah="clr-namespace:MahApps.Metro.Controls">
 
     <ResourceDictionary.MergedDictionaries>
         <ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ComboBox.xaml" />
     </ResourceDictionary.MergedDictionaries>
 
-    <system:Double x:Key="MahApps.Sizes.ColorListBox.ItemWidth">16</system:Double>
-    <system:Double x:Key="MahApps.Sizes.ColorListBox.ItemHeight">16</system:Double>
-
     <BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
 
     <DataTemplate x:Key="MahApps.Templates.ColorPickerContent.ColorAndName">
@@ -46,6 +42,7 @@
 
     <DataTemplate x:Key="MahApps.Templates.ColorPickerContent.ColorOnly">
         <Border x:Name="Border"
+                Width="{DynamicResource MahApps.Sizes.ColorListBox.ItemWidth}"
                 Height="{DynamicResource MahApps.Sizes.ColorListBox.ItemHeight}"
                 HorizontalAlignment="Stretch"
                 VerticalAlignment="Stretch"