From 38e486653195fed8adeede994f9bade38cb88f41 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 6 Mar 2025 22:16:23 +0800
Subject: [PATCH] feat: replace discrete FontWeight & specify
 DefaultFontWeight.

---
 src/Semi.Avalonia/Controls/ContextMenu.axaml           | 1 -
 src/Semi.Avalonia/Controls/DatePicker.axaml            | 1 -
 src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml | 1 +
 src/Semi.Avalonia/Controls/ListBox.axaml               | 1 -
 src/Semi.Avalonia/Controls/ThemeVariantScope.axaml     | 1 +
 src/Semi.Avalonia/Controls/TimePicker.axaml            | 1 -
 src/Semi.Avalonia/Controls/Window.axaml                | 1 +
 src/Semi.Avalonia/Themes/Shared/Window.axaml           | 1 +
 8 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/src/Semi.Avalonia/Controls/ContextMenu.axaml b/src/Semi.Avalonia/Controls/ContextMenu.axaml
index c8baeb8..ebe1d59 100644
--- a/src/Semi.Avalonia/Controls/ContextMenu.axaml
+++ b/src/Semi.Avalonia/Controls/ContextMenu.axaml
@@ -12,7 +12,6 @@
         <Setter Property="Padding" Value="{DynamicResource MenuFlyoutPadding}" />
         <Setter Property="Focusable" Value="True" />
         <Setter Property="HorizontalAlignment" Value="Stretch" />
-        <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="WindowManagerAddShadowHint" Value="False" />
         <Setter Property="Template">
             <ControlTemplate TargetType="ContextMenu">
diff --git a/src/Semi.Avalonia/Controls/DatePicker.axaml b/src/Semi.Avalonia/Controls/DatePicker.axaml
index b56eef3..f7c32d0 100644
--- a/src/Semi.Avalonia/Controls/DatePicker.axaml
+++ b/src/Semi.Avalonia/Controls/DatePicker.axaml
@@ -6,7 +6,6 @@
         <Setter Property="Width" Value="296" />
         <Setter Property="MinWidth" Value="296" />
         <Setter Property="MaxHeight" Value="300" />
-        <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Background" Value="{DynamicResource DateTimePickerPopupBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerPopupBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
index e8c1ea8..a7e817e 100644
--- a/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
+++ b/src/Semi.Avalonia/Controls/EmbeddableControlRoot.axaml
@@ -3,6 +3,7 @@
         <Setter Property="Background" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultFontWeight}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
         <Setter Property="Template">
             <ControlTemplate>
diff --git a/src/Semi.Avalonia/Controls/ListBox.axaml b/src/Semi.Avalonia/Controls/ListBox.axaml
index 1ab2149..a17e877 100644
--- a/src/Semi.Avalonia/Controls/ListBox.axaml
+++ b/src/Semi.Avalonia/Controls/ListBox.axaml
@@ -59,7 +59,6 @@
                     Content="{TemplateBinding Content}"
                     ContentTemplate="{TemplateBinding ContentTemplate}"
                     CornerRadius="{TemplateBinding CornerRadius}"
-                    FontWeight="Normal"
                     Foreground="{TemplateBinding Foreground}" />
             </ControlTemplate>
         </Setter>
diff --git a/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml b/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml
index 5ea1380..7831b89 100644
--- a/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml
+++ b/src/Semi.Avalonia/Controls/ThemeVariantScope.axaml
@@ -5,6 +5,7 @@
     <ControlTheme x:Key="{x:Type ThemeVariantScope}" TargetType="ThemeVariantScope">
         <Setter Property="TextElement.Foreground" Value="{DynamicResource DefaultForeground}" />
         <Setter Property="TextElement.FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="TextElement.FontWeight" Value="{DynamicResource DefaultFontWeight}" />
         <Setter Property="TextElement.FontFamily" Value="{DynamicResource DefaultFontFamily}" />
     </ControlTheme>
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/TimePicker.axaml b/src/Semi.Avalonia/Controls/TimePicker.axaml
index f2fbff6..d060776 100644
--- a/src/Semi.Avalonia/Controls/TimePicker.axaml
+++ b/src/Semi.Avalonia/Controls/TimePicker.axaml
@@ -6,7 +6,6 @@
         <Setter Property="Width" Value="242" />
         <Setter Property="MinWidth" Value="242" />
         <Setter Property="MaxHeight" Value="300" />
-        <Setter Property="FontWeight" Value="Normal" />
         <Setter Property="Background" Value="{DynamicResource DateTimePickerPopupBackground}" />
         <Setter Property="BorderBrush" Value="{DynamicResource DateTimePickerPopupBorderBrush}" />
         <Setter Property="BorderThickness" Value="1" />
diff --git a/src/Semi.Avalonia/Controls/Window.axaml b/src/Semi.Avalonia/Controls/Window.axaml
index a3f5d07..d858a03 100644
--- a/src/Semi.Avalonia/Controls/Window.axaml
+++ b/src/Semi.Avalonia/Controls/Window.axaml
@@ -7,6 +7,7 @@
         <Setter Property="TransparencyBackgroundFallback" Value="{DynamicResource WindowDefaultBackground}" />
         <Setter Property="Foreground" Value="{DynamicResource WindowDefaultForeground}" />
         <Setter Property="FontSize" Value="{DynamicResource DefaultFontSize}" />
+        <Setter Property="FontWeight" Value="{DynamicResource DefaultFontWeight}" />
         <Setter Property="FontFamily" Value="{DynamicResource DefaultFontFamily}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="Window">
diff --git a/src/Semi.Avalonia/Themes/Shared/Window.axaml b/src/Semi.Avalonia/Themes/Shared/Window.axaml
index 6c18d0f..066a405 100644
--- a/src/Semi.Avalonia/Themes/Shared/Window.axaml
+++ b/src/Semi.Avalonia/Themes/Shared/Window.axaml
@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <StaticResource x:Key="DefaultFontSize" ResourceKey="SemiFontSizeRegular" />
+    <StaticResource x:Key="DefaultFontWeight" ResourceKey="SemiFontWeightRegular" />
     <StaticResource x:Key="DefaultFontFamily" ResourceKey="SemiFontFamilyRegular" />
 </ResourceDictionary>
\ No newline at end of file