feat: utilize combobox popup resources.
This commit is contained in:
@@ -74,7 +74,7 @@
|
|||||||
Placement="BottomEdgeAlignedLeft"
|
Placement="BottomEdgeAlignedLeft"
|
||||||
PlacementTarget="{TemplateBinding}">
|
PlacementTarget="{TemplateBinding}">
|
||||||
<Border
|
<Border
|
||||||
Margin="8"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
Padding="8"
|
Padding="8"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
||||||
|
|||||||
@@ -82,7 +82,7 @@
|
|||||||
Placement="BottomEdgeAlignedLeft"
|
Placement="BottomEdgeAlignedLeft"
|
||||||
PlacementTarget="Background">
|
PlacementTarget="Background">
|
||||||
<Border
|
<Border
|
||||||
Margin="8"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
Padding="8"
|
Padding="8"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
|
|||||||
@@ -73,7 +73,7 @@
|
|||||||
Placement="BottomEdgeAlignedLeft"
|
Placement="BottomEdgeAlignedLeft"
|
||||||
PlacementTarget="{TemplateBinding}">
|
PlacementTarget="{TemplateBinding}">
|
||||||
<Border
|
<Border
|
||||||
Margin="8"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
Padding="8"
|
Padding="8"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
||||||
|
|||||||
@@ -110,7 +110,7 @@
|
|||||||
IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsDropDownOpen, Mode=TwoWay}"
|
IsOpen="{Binding RelativeSource={RelativeSource TemplatedParent}, Path=IsDropDownOpen, Mode=TwoWay}"
|
||||||
PlacementTarget="PART_RootGrid">
|
PlacementTarget="PART_RootGrid">
|
||||||
<Border
|
<Border
|
||||||
Margin="0,4"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
||||||
|
|||||||
@@ -159,7 +159,7 @@
|
|||||||
Placement="BottomEdgeAlignedLeft"
|
Placement="BottomEdgeAlignedLeft"
|
||||||
PlacementTarget="Background">
|
PlacementTarget="Background">
|
||||||
<Border
|
<Border
|
||||||
Margin="0,4"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
||||||
|
|||||||
@@ -83,7 +83,7 @@
|
|||||||
Placement="BottomEdgeAlignedLeft"
|
Placement="BottomEdgeAlignedLeft"
|
||||||
PlacementTarget="Background">
|
PlacementTarget="Background">
|
||||||
<Border
|
<Border
|
||||||
Margin="0,4"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
HorizontalAlignment="Stretch"
|
HorizontalAlignment="Stretch"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
||||||
|
|||||||
@@ -111,7 +111,7 @@
|
|||||||
WindowManagerAddShadowHint="False">
|
WindowManagerAddShadowHint="False">
|
||||||
<Border
|
<Border
|
||||||
Name="PopupBorder"
|
Name="PopupBorder"
|
||||||
Margin="0,4"
|
Margin="{DynamicResource ComboBoxPopupBorderMargin}"
|
||||||
Background="{DynamicResource ComboBoxPopupBackground}"
|
Background="{DynamicResource ComboBoxPopupBackground}"
|
||||||
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
BorderBrush="{DynamicResource ComboBoxPopupBorderBrush}"
|
||||||
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
|
BorderThickness="{DynamicResource ComboBoxPopupBorderThickness}"
|
||||||
|
|||||||
@@ -15,6 +15,8 @@
|
|||||||
<ResourceInclude Source="Themes/Shared/_index.axaml" />
|
<ResourceInclude Source="Themes/Shared/_index.axaml" />
|
||||||
<ResourceInclude Source="Locale/zh-cn.axaml" />
|
<ResourceInclude Source="Locale/zh-cn.axaml" />
|
||||||
</ResourceDictionary.MergedDictionaries>
|
</ResourceDictionary.MergedDictionaries>
|
||||||
|
<!-- This resource definition is from Semi Avalonia 11.2.1. This can be removed after Ursa dependency is higher than Avalonia 11.2.1 -->
|
||||||
|
<Thickness x:Key="ComboBoxPopupBorderMargin">4</Thickness>
|
||||||
</ResourceDictionary>
|
</ResourceDictionary>
|
||||||
</Styles.Resources>
|
</Styles.Resources>
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user