fix: fix Flyout Placement.

This commit is contained in:
Zhang Dian
2024-08-12 16:35:51 +08:00
parent 73687eb72f
commit 4d3c9630c3
3 changed files with 46 additions and 43 deletions

View File

@@ -9,46 +9,48 @@
d:DesignHeight="1450" d:DesignHeight="1450"
d:DesignWidth="800" d:DesignWidth="800"
mc:Ignorable="d"> mc:Ignorable="d">
<StackPanel Spacing="20"> <ScrollViewer>
<StackPanel <StackPanel Spacing="20">
VerticalAlignment="Top" <StackPanel
Orientation="Horizontal" VerticalAlignment="Top"
Spacing="20"> Orientation="Horizontal"
<ColorView ColorSpectrumShape="Ring" /> Spacing="20">
<ColorView ColorSpectrumShape="Box" /> <ColorView ColorSpectrumShape="Ring" />
<ColorView Palette="{DynamicResource SemiColorPalette}" /> <ColorView ColorSpectrumShape="Box" />
</StackPanel> <ColorView Palette="{DynamicResource SemiColorPalette}" />
<StackPanel </StackPanel>
VerticalAlignment="Top" <StackPanel
Orientation="Horizontal"> VerticalAlignment="Top"
<ColorView Orientation="Horizontal">
Theme="{StaticResource SimpleColorView}" <ColorView
IsAlphaVisible="True" Theme="{StaticResource SimpleColorView}"
HsvColor="hsv(120,11%,10%)" /> IsAlphaVisible="True"
</StackPanel> HsvColor="hsv(120,11%,10%)" />
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal"> </StackPanel>
<ColorPicker ColorSpectrumShape="Ring"> <StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<ColorPicker.Palette> <ColorPicker ColorSpectrumShape="Ring">
<controls:FlatHalfColorPalette /> <ColorPicker.Palette>
</ColorPicker.Palette> <controls:FlatHalfColorPalette />
</ColorPicker> </ColorPicker.Palette>
<ColorPicker ColorSpectrumShape="Box"> </ColorPicker>
<ColorPicker.Palette> <ColorPicker ColorSpectrumShape="Box">
<colorPicker:SemiColorLightPalette /> <ColorPicker.Palette>
</ColorPicker.Palette> <colorPicker:SemiColorLightPalette />
</ColorPicker> </ColorPicker.Palette>
</ColorPicker>
<ColorPicker ColorSpectrumShape="Box" Theme="{DynamicResource HexColorPicker}"> <ColorPicker ColorSpectrumShape="Box" Theme="{DynamicResource HexColorPicker}">
<ColorPicker.Palette> <ColorPicker.Palette>
<colorPicker:SemiColorLightPalette /> <colorPicker:SemiColorLightPalette />
</ColorPicker.Palette> </ColorPicker.Palette>
</ColorPicker> </ColorPicker>
</StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal">
<ColorPicker Theme="{StaticResource SimpleColorPicker}"
HsvColor="hsv(120,11%,10%)" />
<ColorPicker Theme="{StaticResource HexSimpleColorPicker}"
HsvColor="hsv(120,11%,10%)" />
</StackPanel>
</StackPanel> </StackPanel>
<StackPanel HorizontalAlignment="Left" Orientation="Horizontal"> </ScrollViewer>
<ColorPicker Theme="{StaticResource SimpleColorPicker}"
HsvColor="hsv(120,11%,10%)" />
<ColorPicker Theme="{StaticResource HexSimpleColorPicker}"
HsvColor="hsv(120,11%,10%)" />
</StackPanel>
</StackPanel>
</UserControl> </UserControl>

View File

@@ -538,7 +538,7 @@
</Style> </Style>
</DropDownButton.Styles> </DropDownButton.Styles>
<DropDownButton.Flyout> <DropDownButton.Flyout>
<Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource ColorPickerFlyoutPlacement}"> <Flyout FlyoutPresenterClasses="nopadding" Placement="{DynamicResource SimpleColorPickerFlyoutPlacement}">
<!-- <!--
The following is copy-pasted from the ColorView's control template. The following is copy-pasted from the ColorView's control template.

View File

@@ -29,4 +29,5 @@
<colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" /> <colorPicker:SemiColorDarkPalette x:Key="SemiColorPalette" />
<PlacementMode x:Key="ColorPickerFlyoutPlacement">AnchorAndGravity</PlacementMode> <PlacementMode x:Key="ColorPickerFlyoutPlacement">AnchorAndGravity</PlacementMode>
<PlacementMode x:Key="SimpleColorPickerFlyoutPlacement">BottomEdgeAlignedLeft</PlacementMode>
</ResourceDictionary> </ResourceDictionary>