Skip to content

Commit 272e559

Browse files
committed
Merge branch 'develop' into main
2 parents 1377831 + 8507c2a commit 272e559

File tree

3 files changed

+3
-7
lines changed

3 files changed

+3
-7
lines changed

src/MahApps.Metro/Themes/ColorPicker/ColorEyeDropper.xaml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77
xmlns:po="http://schemas.microsoft.com/winfx/2006/xaml/presentation/options"
88
mc:Ignorable="po d">
99

10-
<Cursor x:Key="MahApps.Cursors.EyeDropper">../../Assets/Eyedropper.cur</Cursor>
10+
<Cursor x:Key="MahApps.Cursors.EyeDropper">pack://application:,,,/MahApps.Metro;component/Assets/Eyedropper.cur</Cursor>
1111

1212
<Style x:Key="MahApps.Styles.ColorEyeDropper"
1313
BasedOn="{StaticResource {x:Type Button}}"

src/MahApps.Metro/Themes/ColorPicker/ColorPalette.xaml

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@
1414
<Style x:Key="MahApps.Styles.ListBoxItem.ColorPaletteItem"
1515
BasedOn="{StaticResource MahApps.Styles.ListBoxItem}"
1616
TargetType="{x:Type ListBoxItem}">
17-
<Setter Property="Background" Value="{DynamicResource MahApps.Brushes.White}" />
1817
<Setter Property="BorderBrush" Value="{DynamicResource MahApps.Brushes.Control.Border}" />
1918
<Setter Property="BorderThickness" Value="1" />
2019
<Setter Property="MinHeight" Value="1" />

src/MahApps.Metro/Themes/ColorPicker/ColorPicker.xaml

Lines changed: 2 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,16 +2,12 @@
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:controlzex="urn:controlzex"
44
xmlns:converters="clr-namespace:MahApps.Metro.Converters"
5-
xmlns:mah="clr-namespace:MahApps.Metro.Controls"
6-
xmlns:system="clr-namespace:System;assembly=mscorlib">
5+
xmlns:mah="clr-namespace:MahApps.Metro.Controls">
76

87
<ResourceDictionary.MergedDictionaries>
98
<ResourceDictionary Source="pack://application:,,,/MahApps.Metro;component/Styles/Controls.ComboBox.xaml" />
109
</ResourceDictionary.MergedDictionaries>
1110

12-
<system:Double x:Key="MahApps.Sizes.ColorListBox.ItemWidth">16</system:Double>
13-
<system:Double x:Key="MahApps.Sizes.ColorListBox.ItemHeight">16</system:Double>
14-
1511
<BooleanToVisibilityConverter x:Key="BooleanToVisibilityConverter" />
1612

1713
<DataTemplate x:Key="MahApps.Templates.ColorPickerContent.ColorAndName">
@@ -46,6 +42,7 @@
4642

4743
<DataTemplate x:Key="MahApps.Templates.ColorPickerContent.ColorOnly">
4844
<Border x:Name="Border"
45+
Width="{DynamicResource MahApps.Sizes.ColorListBox.ItemWidth}"
4946
Height="{DynamicResource MahApps.Sizes.ColorListBox.ItemHeight}"
5047
HorizontalAlignment="Stretch"
5148
VerticalAlignment="Stretch"

0 commit comments

Comments
 (0)