Skip to content

Commit a68dd95

Browse files
michael-hawkerRosuavio
authored andcommitted
Fix reference in Input package to Primitives package
(Otherwise we need to apply Markdown package csproj patch to be able to reference Core.) TODO: Only thing that this leaves us though is a missing DropShadowPanel for the ColorPicker... But I think it might be ok?
1 parent c67193d commit a68dd95

File tree

2 files changed

+24
-22
lines changed

2 files changed

+24
-22
lines changed

Microsoft.Toolkit.Uwp.UI.Controls.Input/ColorPicker/ColorPicker.xaml

Lines changed: 23 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
22
xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
33
xmlns:controls="using:Microsoft.Toolkit.Uwp.UI.Controls"
4-
xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives"
54
xmlns:converters="using:Microsoft.Toolkit.Uwp.UI.Converters"
65
xmlns:ex="using:Microsoft.Toolkit.Uwp.UI.Extensions"
7-
xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters">
6+
xmlns:localconverters="using:Microsoft.Toolkit.Uwp.UI.Controls.ColorPickerConverters"
7+
xmlns:primitives="using:Microsoft.Toolkit.Uwp.UI.Controls.Primitives">
88

99
<SolidColorBrush x:Key="CheckerboardColor0">
1010
<SolidColorBrush.Color>
@@ -449,32 +449,34 @@
449449
</Border>
450450
<!-- Main Color Preview Box at Bottom -->
451451
<!-- Must be last for drop shadow Z-index -->
452-
<controls:DropShadowPanel Grid.RowSpan="3"
452+
<!--<controls:DropShadowPanel Grid.RowSpan="3"
453453
Grid.Column="2"
454454
HorizontalContentAlignment="Stretch"
455455
VerticalContentAlignment="Stretch"
456456
BlurRadius="10.0"
457457
OffsetX="0.0"
458458
OffsetY="0.0"
459459
ShadowOpacity="0.75"
460-
Color="Black">
461-
<Grid>
462-
<Border HorizontalAlignment="Stretch"
463-
VerticalAlignment="Stretch"
464-
Background="{ThemeResource FlyoutPresenterBackground}"
465-
CornerRadius="2" />
466-
<Border x:Name="CheckeredBackground3Border"
467-
HorizontalAlignment="Stretch"
468-
VerticalAlignment="Stretch"
469-
CornerRadius="2" />
470-
<Border x:Name="PreviewBorder"
471-
CornerRadius="2">
472-
<Border.Background>
473-
<SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
474-
</Border.Background>
475-
</Border>
476-
</Grid>
477-
</controls:DropShadowPanel>
460+
Color="Black"> Not too far off without it, maybe we can fake?-->
461+
<Grid Grid.RowSpan="3"
462+
Grid.Column="2"
463+
HorizontalAlignment="Stretch"
464+
VerticalAlignment="Stretch">
465+
<Border HorizontalAlignment="Stretch"
466+
VerticalAlignment="Stretch"
467+
Background="{ThemeResource FlyoutPresenterBackground}"
468+
CornerRadius="2" />
469+
<Border x:Name="CheckeredBackground3Border"
470+
HorizontalAlignment="Stretch"
471+
VerticalAlignment="Stretch"
472+
CornerRadius="2" />
473+
<Border x:Name="PreviewBorder"
474+
CornerRadius="2">
475+
<Border.Background>
476+
<SolidColorBrush Color="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=Color}" />
477+
</Border.Background>
478+
</Border>
479+
</Grid>
478480
</Grid>
479481
<VisualStateManager.VisualStateGroups>
480482

Microsoft.Toolkit.Uwp.UI.Controls.Input/Microsoft.Toolkit.Uwp.UI.Controls.Input.csproj

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@
2020
</PropertyGroup>
2121

2222
<ItemGroup>
23-
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Core\Microsoft.Toolkit.Uwp.UI.Controls.Core.csproj" />
23+
<ProjectReference Include="..\Microsoft.Toolkit.Uwp.UI.Controls.Primitives\Microsoft.Toolkit.Uwp.UI.Controls.Primitives.csproj" />
2424
</ItemGroup>
2525

2626
<ItemGroup>

0 commit comments

Comments
 (0)