From 8ad659cba6973a2de0ed9d89b8a5856436f1083f Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Wed, 21 Dec 2022 17:12:11 +0800
Subject: [PATCH 1/3] feat: WIP: flyout default theme. pending on
 DynamicResource.

---
 src/Semi.Avalonia.Demo/MainWindow.axaml       |  3 ++
 src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml | 23 ++++++++++
 .../Pages/FlyoutDemo.axaml.cs                 | 19 ++++++++
 src/Semi.Avalonia.Demo/Program.cs             |  2 +-
 src/Semi.Avalonia/Controls/Controls.axaml     |  2 +
 .../Controls/FlyoutPresenter.axaml            | 44 +++++++++++++++++++
 src/Semi.Avalonia/Controls/Popup.axaml        | 23 ++++++++++
 src/Semi.Avalonia/Themes/LightTheme.axaml     | 13 +++---
 8 files changed, 121 insertions(+), 8 deletions(-)
 create mode 100644 src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
 create mode 100644 src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
 create mode 100644 src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
 create mode 100644 src/Semi.Avalonia/Controls/Popup.axaml

diff --git a/src/Semi.Avalonia.Demo/MainWindow.axaml b/src/Semi.Avalonia.Demo/MainWindow.axaml
index 2b3c127..e5a4b98 100644
--- a/src/Semi.Avalonia.Demo/MainWindow.axaml
+++ b/src/Semi.Avalonia.Demo/MainWindow.axaml
@@ -44,5 +44,8 @@
         <TabItem Header="ListBox">
             <pages:ListBoxItem />
         </TabItem>
+        <TabItem Header="Flyout">
+            <pages:FlyoutDemo />
+        </TabItem>
     </TabControl>
 </Window>
diff --git a/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml b/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
new file mode 100644
index 0000000..d888da6
--- /dev/null
+++ b/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
@@ -0,0 +1,23 @@
+<UserControl
+    x:Class="Semi.Avalonia.Demo.Pages.FlyoutDemo"
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
+    xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
+    d:DesignHeight="450"
+    d:DesignWidth="800"
+    mc:Ignorable="d">
+    <StackPanel>
+        <StackPanel>
+            <Button Content="Hello">
+                <Button.Flyout>
+                    <Flyout Placement="Top" ShowMode="Standard">
+                        <StackPanel>
+                            <TextBlock>Hello World</TextBlock>
+                        </StackPanel>
+                    </Flyout>
+                </Button.Flyout>
+            </Button>
+        </StackPanel>
+    </StackPanel>
+</UserControl>
diff --git a/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs b/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
new file mode 100644
index 0000000..cc81678
--- /dev/null
+++ b/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml.cs
@@ -0,0 +1,19 @@
+using Avalonia;
+using Avalonia.Controls;
+using Avalonia.LogicalTree;
+using Avalonia.Markup.Xaml;
+
+namespace Semi.Avalonia.Demo.Pages;
+
+public partial class FlyoutDemo : UserControl
+{
+    public FlyoutDemo()
+    {
+        InitializeComponent();
+    }
+
+    private void InitializeComponent()
+    {
+        AvaloniaXamlLoader.Load(this);
+    }
+}
\ No newline at end of file
diff --git a/src/Semi.Avalonia.Demo/Program.cs b/src/Semi.Avalonia.Demo/Program.cs
index 77b86bd..f1878c7 100644
--- a/src/Semi.Avalonia.Demo/Program.cs
+++ b/src/Semi.Avalonia.Demo/Program.cs
@@ -27,7 +27,7 @@ namespace Semi.Avalonia.Demo
         public static AppBuilder BuildAvaloniaApp()
             => AppBuilder.Configure<App>()
                 .UsePlatformDetect()
-                .With(new Win32PlatformOptions(){ UseCompositor = true})
+                .With(new Win32PlatformOptions(){ UseCompositor = false})
                 .LogToTrace();
     }
 }
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/Controls.axaml b/src/Semi.Avalonia/Controls/Controls.axaml
index 512673b..15f6d62 100644
--- a/src/Semi.Avalonia/Controls/Controls.axaml
+++ b/src/Semi.Avalonia/Controls/Controls.axaml
@@ -5,9 +5,11 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Button.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/CheckBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Expander.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/FlyoutPresenter.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/Label.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/ListBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/PathIcon.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Controls/Popup.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/RadioButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/RepeatButton.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Controls/SelectableTextBlock.axaml" />
diff --git a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
new file mode 100644
index 0000000..3239e54
--- /dev/null
+++ b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
@@ -0,0 +1,44 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type FlyoutPresenter}" TargetType="FlyoutPresenter">
+        <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
+        <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
+        <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
+        <Setter Property="FlyoutPresenter.Background" Value="White" />
+        <Setter Property="FlyoutPresenter.BorderBrush" Value="#1A000000" />
+        <Setter Property="FlyoutPresenter.BorderThickness" Value="0.5" />
+        <Setter Property="FlyoutPresenter.Padding" Value="8" />
+        <Setter Property="FlyoutPresenter.MinWidth" Value="100" />
+        <Setter Property="FlyoutPresenter.MaxWidth" Value="600" />
+        <Setter Property="FlyoutPresenter.MinHeight" Value="100" />
+        <Setter Property="FlyoutPresenter.MaxHeight" Value="600" />
+        <Setter Property="FlyoutPresenter.ClipToBounds" Value="False" />
+        <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
+        <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
+        <Setter Property="FlyoutPresenter.CornerRadius" Value="4" />
+        <Setter Property="FlyoutPresenter.Margin" Value="4" />
+        <Setter Property="FlyoutPresenter.Template">
+            <ControlTemplate TargetType="FlyoutPresenter">
+                <Border
+                    Name="LayoutRoot"
+                    Background="{TemplateBinding Background}"
+                    BorderBrush="{TemplateBinding BorderBrush}"
+                    BorderThickness="{TemplateBinding BorderThickness}"
+                    BoxShadow="0 0 8 0 #1A000000"
+                    ClipToBounds="False"
+                    CornerRadius="{TemplateBinding CornerRadius}"
+                    UseLayoutRounding="False">
+                    <ScrollViewer HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}">
+                        <ContentPresenter
+                            Margin="{TemplateBinding Padding}"
+                            HorizontalAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
+                            HorizontalContentAlignment="Stretch"
+                            VerticalContentAlignment="Stretch"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                    </ScrollViewer>
+                </Border>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Controls/Popup.axaml b/src/Semi.Avalonia/Controls/Popup.axaml
new file mode 100644
index 0000000..c643e4a
--- /dev/null
+++ b/src/Semi.Avalonia/Controls/Popup.axaml
@@ -0,0 +1,23 @@
+<ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <ControlTheme x:Key="{x:Type PopupRoot}" TargetType="PopupRoot">
+        <Setter Property="Background" Value="{x:Null}" />
+        <Setter Property="TransparencyLevelHint" Value="Transparent" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="PopupRoot">
+                <LayoutTransformControl LayoutTransform="{TemplateBinding Transform}">
+                    <Panel>
+                        <Border Name="PART_TransparencyFallback" IsHitTestVisible="False" />
+                        <VisualLayerManager IsPopup="True">
+                            <ContentPresenter
+                                Name="PART_ContentPresenter"
+                                Padding="{TemplateBinding Padding}"
+                                Background="{TemplateBinding Background}"
+                                Content="{TemplateBinding Content}"
+                                ContentTemplate="{TemplateBinding ContentTemplate}" />
+                        </VisualLayerManager>
+                    </Panel>
+                </LayoutTransformControl>
+            </ControlTemplate>
+        </Setter>
+    </ControlTheme>
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/LightTheme.axaml b/src/Semi.Avalonia/Themes/LightTheme.axaml
index 28c6a29..c6b6155 100644
--- a/src/Semi.Avalonia/Themes/LightTheme.axaml
+++ b/src/Semi.Avalonia/Themes/LightTheme.axaml
@@ -1,16 +1,15 @@
-<Styles xmlns="https://github.com/avaloniaui"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <!-- Add Resources Here -->
+<Styles xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <!--  Add Resources Here  -->
     <Styles.Resources>
         <ResourceDictionary>
             <ResourceDictionary.MergedDictionaries>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Light.axaml"/>
-                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml"/>
-                <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml"/>
+                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Base.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Light.axaml" />
+                <ResourceInclude Source="avares://Semi.Avalonia/Controls/Controls.axaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Styles.Resources>
     <Style Selector=":is(UserControl)">
-        <Setter Property="Theme" Value="{StaticResource {x:Type UserControl}}"></Setter>
+        <Setter Property="Theme" Value="{StaticResource {x:Type UserControl}}" />
     </Style>
 </Styles>

From 06ab6cd7d5e68199219e38d854b95431a5b48dd4 Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Thu, 22 Dec 2022 01:36:14 +0800
Subject: [PATCH 2/3] feat: add flyout dynamic resource. Pending on
 Menu/MenuItem to add menu flyout theme.

---
 .../Controls/FlyoutPresenter.axaml            | 20 +++++++++----------
 src/Semi.Avalonia/Themes/Light/Flyout.axaml   | 19 ++++++++++++++++++
 src/Semi.Avalonia/Themes/Light/Light.axaml    |  1 +
 3 files changed, 30 insertions(+), 10 deletions(-)
 create mode 100644 src/Semi.Avalonia/Themes/Light/Flyout.axaml

diff --git a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
index 3239e54..d8f0ff8 100644
--- a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
@@ -3,18 +3,18 @@
         <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
         <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
-        <Setter Property="FlyoutPresenter.Background" Value="White" />
-        <Setter Property="FlyoutPresenter.BorderBrush" Value="#1A000000" />
-        <Setter Property="FlyoutPresenter.BorderThickness" Value="0.5" />
-        <Setter Property="FlyoutPresenter.Padding" Value="8" />
-        <Setter Property="FlyoutPresenter.MinWidth" Value="100" />
-        <Setter Property="FlyoutPresenter.MaxWidth" Value="600" />
-        <Setter Property="FlyoutPresenter.MinHeight" Value="100" />
-        <Setter Property="FlyoutPresenter.MaxHeight" Value="600" />
+        <Setter Property="FlyoutPresenter.Background" Value="{DynamicResource FlyoutBackground}" />
+        <Setter Property="FlyoutPresenter.BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" />
+        <Setter Property="FlyoutPresenter.BorderThickness" Value="{DynamicResource FlyoutBorderThickness}" />
+        <Setter Property="FlyoutPresenter.Padding" Value="{DynamicResource FlyoutPadding}" />
+        <Setter Property="FlyoutPresenter.MinWidth" Value="{DynamicResource FlyoutMinWidth}" />
+        <Setter Property="FlyoutPresenter.MaxWidth" Value="{DynamicResource FlyoutMaxWidth}" />
+        <Setter Property="FlyoutPresenter.MinHeight" Value="{DynamicResource FlyoutMinHeight}" />
+        <Setter Property="FlyoutPresenter.MaxHeight" Value="{DynamicResource FlyoutMaxHeight}" />
         <Setter Property="FlyoutPresenter.ClipToBounds" Value="False" />
         <Setter Property="ScrollViewer.HorizontalScrollBarVisibility" Value="Auto" />
         <Setter Property="ScrollViewer.VerticalScrollBarVisibility" Value="Auto" />
-        <Setter Property="FlyoutPresenter.CornerRadius" Value="4" />
+        <Setter Property="FlyoutPresenter.CornerRadius" Value="{DynamicResource FlyoutCornerRadius}" />
         <Setter Property="FlyoutPresenter.Margin" Value="4" />
         <Setter Property="FlyoutPresenter.Template">
             <ControlTemplate TargetType="FlyoutPresenter">
@@ -23,7 +23,7 @@
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    BoxShadow="0 0 8 0 #1A000000"
+                    BoxShadow="{DynamicResource FlyoutBorderBoxShadow}"
                     ClipToBounds="False"
                     CornerRadius="{TemplateBinding CornerRadius}"
                     UseLayoutRounding="False">
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
new file mode 100644
index 0000000..d98d967
--- /dev/null
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -0,0 +1,19 @@
+<ResourceDictionary
+    xmlns="https://github.com/avaloniaui"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:sys="clr-namespace:System;assembly=System.Runtime">
+    <SolidColorBrush x:Key="FlyoutBackground" Color="White" />
+    <SolidColorBrush
+        x:Key="FlyoutBorderBrush"
+        Opacity="0.08"
+        Color="#1C1F23" />
+    <Thickness x:Key="FlyoutBorderThickness">1</Thickness>
+    <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
+    <sys:Double x:Key="FlyoutMinHeight">100</sys:Double>
+    <sys:Double x:Key="FlyoutMinWidth">100</sys:Double>
+    <sys:Double x:Key="FlyoutMaxHeight">600</sys:Double>
+    <sys:Double x:Key="FlyoutMaxWidth">600</sys:Double>
+    <CornerRadius x:Key="FlyoutCornerRadius">6</CornerRadius>
+    <Thickness x:Key="FlyoutPadding">8</Thickness>
+
+</ResourceDictionary>
diff --git a/src/Semi.Avalonia/Themes/Light/Light.axaml b/src/Semi.Avalonia/Themes/Light/Light.axaml
index 53c60ac..0a5a374 100644
--- a/src/Semi.Avalonia/Themes/Light/Light.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Light.axaml
@@ -16,5 +16,6 @@
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TextBox.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/TreeView.axaml" />
         <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Window.axaml" />
+        <ResourceInclude Source="avares://Semi.Avalonia/Themes/Light/Flyout.axaml" />
     </ResourceDictionary.MergedDictionaries>
 </ResourceDictionary>

From d3ca12854edcd2998c67f2d1a8ef5504b5c0b67a Mon Sep 17 00:00:00 2001
From: rabbitism <popmessiah@hotmail.com>
Date: Sat, 24 Dec 2022 14:59:42 +0800
Subject: [PATCH 3/3] feat: set flyout default font weight, add more demos.

---
 src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml | 116 ++++++++++++++++--
 .../Controls/FlyoutPresenter.axaml            |   4 +-
 src/Semi.Avalonia/Themes/Light/Flyout.axaml   |   1 +
 3 files changed, 107 insertions(+), 14 deletions(-)

diff --git a/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml b/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
index d888da6..8c0e35e 100644
--- a/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
+++ b/src/Semi.Avalonia.Demo/Pages/FlyoutDemo.axaml
@@ -7,17 +7,107 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     mc:Ignorable="d">
-    <StackPanel>
-        <StackPanel>
-            <Button Content="Hello">
-                <Button.Flyout>
-                    <Flyout Placement="Top" ShowMode="Standard">
-                        <StackPanel>
-                            <TextBlock>Hello World</TextBlock>
-                        </StackPanel>
-                    </Flyout>
-                </Button.Flyout>
-            </Button>
-        </StackPanel>
-    </StackPanel>
+    <Grid
+        HorizontalAlignment="Center"
+        VerticalAlignment="Center"
+        ColumnDefinitions="* * * * *"
+        RowDefinitions="* * * * *">
+        <Button
+            Grid.Row="0"
+            Grid.Column="1"
+            Content="Top Left">
+            <Button.Flyout>
+                <Flyout Content="TopEdgeAlignedLeft" Placement="TopEdgeAlignedLeft" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="0"
+            Grid.Column="2"
+            Content="Top">
+            <Button.Flyout>
+                <Flyout Content="Top" Placement="Top" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="0"
+            Grid.Column="3"
+            Content="Top Right">
+            <Button.Flyout>
+                <Flyout Content="TopEdgeAlignedRight" Placement="TopEdgeAlignedRight" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="1"
+            Grid.Column="0"
+            Content="Left Top">
+            <Button.Flyout>
+                <Flyout Content="LeftEdgeAlignedTop" Placement="LeftEdgeAlignedTop" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="1"
+            Grid.Column="4"
+            Content="Right Top">
+            <Button.Flyout>
+                <Flyout Content="RightEdgeAlignedTop" Placement="RightEdgeAlignedTop" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="2"
+            Grid.Column="0"
+            Content="Left">
+            <Button.Flyout>
+                <Flyout Content="Left" Placement="Left" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="2"
+            Grid.Column="4"
+            Content="Right">
+            <Button.Flyout>
+                <Flyout Content="Right" Placement="Right" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="3"
+            Grid.Column="0"
+            Content="Left Bottom">
+            <Button.Flyout>
+                <Flyout Content="LeftEdgeAlignedBottom" Placement="LeftEdgeAlignedBottom" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="3"
+            Grid.Column="4"
+            Content="Right Bottom">
+            <Button.Flyout>
+                <Flyout Content="RightEdgeAlignedBottom" Placement="RightEdgeAlignedBottom" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="4"
+            Grid.Column="1"
+            Content="Bottom Left">
+            <Button.Flyout>
+                <Flyout Content="BottomEdgeAlignedLeft" Placement="BottomEdgeAlignedLeft" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="4"
+            Grid.Column="2"
+            Content="Bottom">
+            <Button.Flyout>
+                <Flyout Content="Bottom" Placement="Bottom" />
+            </Button.Flyout>
+        </Button>
+        <Button
+            Grid.Row="4"
+            Grid.Column="3"
+            Content="Bottom Right">
+            <Button.Flyout>
+                <Flyout Content="BottomEdgeAlignedRight" Placement="BottomEdgeAlignedRight" />
+            </Button.Flyout>
+        </Button>
+    </Grid>
+
 </UserControl>
diff --git a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
index d8f0ff8..651916d 100644
--- a/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
+++ b/src/Semi.Avalonia/Controls/FlyoutPresenter.axaml
@@ -3,6 +3,7 @@
         <Setter Property="FlyoutPresenter.HorizontalContentAlignment" Value="Stretch" />
         <Setter Property="FlyoutPresenter.VerticalContentAlignment" Value="Stretch" />
         <Setter Property="FlyoutPresenter.UseLayoutRounding" Value="False" />
+        <Setter Property="FlyoutPresenter.FontWeight" Value="{DynamicResource FlyoutFontWeight}" />
         <Setter Property="FlyoutPresenter.Background" Value="{DynamicResource FlyoutBackground}" />
         <Setter Property="FlyoutPresenter.BorderBrush" Value="{DynamicResource FlyoutBorderBrush}" />
         <Setter Property="FlyoutPresenter.BorderThickness" Value="{DynamicResource FlyoutBorderThickness}" />
@@ -35,7 +36,8 @@
                             HorizontalContentAlignment="Stretch"
                             VerticalContentAlignment="Stretch"
                             Content="{TemplateBinding Content}"
-                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                            ContentTemplate="{TemplateBinding ContentTemplate}"
+                            FontWeight="{TemplateBinding FontWeight}" />
                     </ScrollViewer>
                 </Border>
             </ControlTemplate>
diff --git a/src/Semi.Avalonia/Themes/Light/Flyout.axaml b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
index d98d967..ca7579e 100644
--- a/src/Semi.Avalonia/Themes/Light/Flyout.axaml
+++ b/src/Semi.Avalonia/Themes/Light/Flyout.axaml
@@ -7,6 +7,7 @@
         x:Key="FlyoutBorderBrush"
         Opacity="0.08"
         Color="#1C1F23" />
+    <FontWeight x:Key="FlyoutFontWeight">400</FontWeight>
     <Thickness x:Key="FlyoutBorderThickness">1</Thickness>
     <BoxShadows x:Key="FlyoutBorderBoxShadow">0 0 8 0 #1A000000</BoxShadows>
     <sys:Double x:Key="FlyoutMinHeight">100</sys:Double>