Skip to content

Commit bcec807

Browse files
committed
ux: border of popup menu
Signed-off-by: leo <longshuang@msn.cn>
1 parent 3b8af02 commit bcec807

2 files changed

Lines changed: 16 additions & 8 deletions

File tree

src/Resources/Styles.axaml

Lines changed: 13 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -761,12 +761,13 @@
761761

762762
<Style Selector="ContextMenu">
763763
<Setter Property="MaxWidth" Value="1024"/>
764-
<Setter Property="HorizontalOffset" Value="-4"/>
765-
<Setter Property="VerticalOffset" Value="-4"/>
764+
<Setter Property="HorizontalOffset" Value="-6"/>
765+
<Setter Property="VerticalOffset" Value="-6"/>
766766
<Setter Property="Template">
767767
<ControlTemplate>
768-
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
769-
<Border BorderThickness="0"
768+
<Grid Margin="6" Effect="drop-shadow(0 0 6 #B0000000)">
769+
<Border BorderThickness="1"
770+
BorderBrush="{DynamicResource Brush.MenuBorder}"
770771
Background="{DynamicResource Brush.Popup}"
771772
CornerRadius="{TemplateBinding CornerRadius}"
772773
Padding="8,4"
@@ -792,8 +793,8 @@
792793
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
793794
<Border Name="LayoutRoot"
794795
Background="{DynamicResource Brush.Popup}"
795-
BorderBrush="{TemplateBinding BorderBrush}"
796-
BorderThickness="0"
796+
BorderBrush="{DynamicResource Brush.MenuBorder}"
797+
BorderThickness="1"
797798
Padding="4,2"
798799
CornerRadius="{TemplateBinding CornerRadius}">
799800
<ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}"
@@ -902,8 +903,12 @@
902903
HorizontalOffset="-4"
903904
VerticalOffset="-4"
904905
IsOpen="{TemplateBinding IsSubMenuOpen, Mode=TwoWay}">
905-
<Grid Margin="4" Effect="drop-shadow(0 0 4 #A0000000)">
906-
<Border BorderThickness="0" Padding="8,4" MaxHeight="400" Background="{DynamicResource Brush.Popup}" CornerRadius="{DynamicResource OverlayCornerRadius}">
906+
<Grid Margin="6" Effect="drop-shadow(0 0 6 #B0000000)">
907+
<Border Padding="8,4"
908+
MaxHeight="400"
909+
BorderThickness="1" BorderBrush="{DynamicResource Brush.MenuBorder}"
910+
Background="{DynamicResource Brush.Popup}"
911+
CornerRadius="{DynamicResource OverlayCornerRadius}">
907912
<ScrollViewer>
908913
<ItemsPresenter Name="PART_ItemsPresenter"
909914
Margin="{DynamicResource MenuFlyoutScrollerMargin}"

src/Resources/Themes.axaml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
<Color x:Key="Color.InlineCode">#FFE4E4E4</Color>
3333
<Color x:Key="Color.InlineCodeFG">Black</Color>
3434
<Color x:Key="Color.HistoryBG">#FFF0F5F9</Color>
35+
<Color x:Key="Color.MenuBorder">White</Color>
3536
</ResourceDictionary>
3637

3738
<ResourceDictionary x:Key="Dark">
@@ -65,6 +66,7 @@
6566
<Color x:Key="Color.InlineCode">#FF383838</Color>
6667
<Color x:Key="Color.InlineCodeFG">#FFF0F0F0</Color>
6768
<Color x:Key="Color.HistoryBG">#FF272727</Color>
69+
<Color x:Key="Color.MenuBorder">#FF393939</Color>
6870
</ResourceDictionary>
6971
</ResourceDictionary.ThemeDictionaries>
7072

@@ -100,6 +102,7 @@
100102
<SolidColorBrush x:Key="Brush.InlineCode" Color="{DynamicResource Color.InlineCode}"/>
101103
<SolidColorBrush x:Key="Brush.InlineCodeFG" Color="{DynamicResource Color.InlineCodeFG}"/>
102104
<SolidColorBrush x:Key="Brush.HistoryBG" Color="{DynamicResource Color.HistoryBG}"/>
105+
<SolidColorBrush x:Key="Brush.MenuBorder" Color="{DynamicResource Color.MenuBorder}"/>
103106

104107
<FontFamily x:Key="Fonts.Default">fonts:Inter#Inter</FontFamily>
105108
<FontFamily x:Key="Fonts.Monospace">fonts:SourceGit#JetBrains Mono NL</FontFamily>

0 commit comments

Comments
 (0)