zhaoyushun1999/Semi.Avalonia
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: fix multiple dropdown/popup/flyout margin and corner radius.

Browse Source
This commit is contained in:
rabbitism 2023-01-30 23:06:58 +08:00
parent a7d0568526
commit 500f6526b0
5 changed files with 11 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/Semi.Avalonia/Controls/Menu.axaml
View File

@ -172,18 +172,19 @@
</Border> </Border>
<Popup <Popup
Name="PART_Popup" Name="PART_Popup"
HorizontalOffset="{DynamicResource MenuFlyoutSubItemPopupHorizontalOffset}" HorizontalOffset="-8"
IsLightDismissEnabled="False" IsLightDismissEnabled="False"
IsOpen="{TemplateBinding IsSubMenuOpen, IsOpen="{TemplateBinding IsSubMenuOpen,
Mode=TwoWay}" Mode=TwoWay}"
PlacementMode="Right" PlacementMode="Right"
VerticalOffset="-4"
WindowManagerAddShadowHint="False"> WindowManagerAddShadowHint="False">
<Border <Border
MinWidth="{DynamicResource MenuFlyoutMinWidth}" MinWidth="{DynamicResource MenuFlyoutMinWidth}"
MinHeight="{DynamicResource MenuFlyoutMinHeight}" MinHeight="{DynamicResource MenuFlyoutMinHeight}"
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}" MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}" MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
Margin="4" Margin="8"
Padding="{DynamicResource MenuFlyoutPadding}" Padding="{DynamicResource MenuFlyoutPadding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource MenuFlyoutBackground}" Background="{DynamicResource MenuFlyoutBackground}"
@ -274,17 +275,19 @@
<Popup <Popup
Name="PART_Popup" Name="PART_Popup"
MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}" MinWidth="{Binding Bounds.Width, RelativeSource={RelativeSource TemplatedParent}}"
HorizontalOffset="-8"
IsLightDismissEnabled="True" IsLightDismissEnabled="True"
IsOpen="{TemplateBinding IsSubMenuOpen, IsOpen="{TemplateBinding IsSubMenuOpen,
Mode=TwoWay}" Mode=TwoWay}"
OverlayInputPassThroughElement="{Binding $parent[Menu]}" OverlayInputPassThroughElement="{Binding $parent[Menu]}"
VerticalOffset="-4"
WindowManagerAddShadowHint="False"> WindowManagerAddShadowHint="False">
<Border <Border
MinWidth="{DynamicResource MenuFlyoutMinWidth}" MinWidth="{DynamicResource MenuFlyoutMinWidth}"
MinHeight="{DynamicResource MenuFlyoutMinHeight}" MinHeight="{DynamicResource MenuFlyoutMinHeight}"
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}" MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}" MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
Margin="4" Margin="8"
Padding="{DynamicResource MenuFlyoutPadding}" Padding="{DynamicResource MenuFlyoutPadding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource MenuFlyoutBackground}" Background="{DynamicResource MenuFlyoutBackground}"

2
src/Semi.Avalonia/Controls/MenuFlyoutPresenter.axaml
View File

@ -20,7 +20,7 @@
MinHeight="{DynamicResource MenuFlyoutMinHeight}" MinHeight="{DynamicResource MenuFlyoutMinHeight}"
MaxWidth="{DynamicResource MenuFlyoutMaxWidth}" MaxWidth="{DynamicResource MenuFlyoutMaxWidth}"
MaxHeight="{DynamicResource MenuFlyoutMaxHeight}" MaxHeight="{DynamicResource MenuFlyoutMaxHeight}"
Margin="0,4" Margin="8"
Padding="{DynamicResource MenuFlyoutPadding}" Padding="{DynamicResource MenuFlyoutPadding}"
HorizontalAlignment="Stretch" HorizontalAlignment="Stretch"
Background="{DynamicResource MenuFlyoutBackground}" Background="{DynamicResource MenuFlyoutBackground}"

4
src/Semi.Avalonia/Controls/NotificationCard.axaml
View File

@ -18,8 +18,8 @@
<ControlTemplate TargetType="NotificationCard"> <ControlTemplate TargetType="NotificationCard">
<LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True"> <LayoutTransformControl Name="PART_LayoutTransformControl" UseRenderTransform="True">
<Border <Border
Margin="4" Margin="8"
BoxShadow="0 0 14 #1A000000" BoxShadow="0 0 8 0 #1A000000"
CornerRadius="{TemplateBinding CornerRadius}"> CornerRadius="{TemplateBinding CornerRadius}">
<Border <Border
Background="{TemplateBinding Background}" Background="{TemplateBinding Background}"

2
src/Semi.Avalonia/Themes/Light/AutoCompleteBox.axaml
View File

@ -5,7 +5,7 @@
<SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" /> <SolidColorBrush x:Key="AutoCompleteBoxPopupBackground" Color="White" />
<SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" /> <SolidColorBrush x:Key="AutoCompleteBoxPopupBorderBrush" Opacity="0.08" Color="#1C1F23" />
<Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness> <Thickness x:Key="AutoCompleteBoxPopupBorderThickness">1</Thickness>
<Thickness x:Key="AutoCompleteBoxPopupMargin">0 4</Thickness> <Thickness x:Key="AutoCompleteBoxPopupMargin">4</Thickness>
<CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius> <CornerRadius x:Key="AutoCompleteBoxPopupCornerRadius">6</CornerRadius>
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBorderBrush" Color="Transparent" />
<SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" /> <SolidColorBrush x:Key="AutoCompleteBoxBorderlessBackground" Opacity="0.05" Color="#2E3238" />

2
src/Semi.Avalonia/Themes/Light/Menu.axaml
View File

@ -15,7 +15,7 @@
<Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness> <Thickness x:Key="MenuFlyoutBorderThickness">1</Thickness>
<Thickness x:Key="MenuFlyoutPadding">0 4</Thickness> <Thickness x:Key="MenuFlyoutPadding">0 4</Thickness>
<BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows> <BoxShadows x:Key="MenuFlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
<CornerRadius x:Key="MenuFlyoutCornerRadius">3</CornerRadius> <CornerRadius x:Key="MenuFlyoutCornerRadius">6</CornerRadius>
<sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double> <sys:Double x:Key="MenuFlyoutMinHeight">16</sys:Double>
<sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double> <sys:Double x:Key="MenuFlyoutMinWidth">100</sys:Double>
<sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double> <sys:Double x:Key="MenuFlyoutMaxHeight">400</sys:Double>