From f22709fcb13cd391906f5523386b0c1d3c5bf681 Mon Sep 17 00:00:00 2001
From: Zhang Dian <54255897+zdpcdt@users.noreply.github.com>
Date: Thu, 26 Mar 2026 14:15:47 +0800
Subject: [PATCH] Update CaptionButtonForeground resource and
 WindowDrawnDecorations layout (#779)

* fix: update CaptionButtonForeground resource key and remove cursor setter.

* fix: update WindowDrawnDecorations layout.

* feat: add CaptionButtonDisabledForeground for disabled state and WindowCustomizationsPage.
---
 .../Pages/WindowCustomizationsPage.axaml      | 32 +++++++++++++++++++
 .../Pages/WindowCustomizationsPage.axaml.cs   | 12 +++++++
 demo/Semi.Avalonia.Demo/Views/MainView.axaml  |  3 ++
 .../Controls/WindowDrawnDecorations.axaml     | 19 ++++++-----
 .../Themes/Dark/WindowDrawnDecorations.axaml  |  3 +-
 .../HighContrast/WindowDrawnDecorations.axaml |  1 +
 .../Themes/Light/WindowDrawnDecorations.axaml |  3 +-
 7 files changed, 61 insertions(+), 12 deletions(-)
 create mode 100644 demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml
 create mode 100644 demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml.cs

diff --git a/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml b/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml
new file mode 100644
index 0000000..8574778
--- /dev/null
+++ b/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml
@@ -0,0 +1,32 @@
+<UserControl 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"
+             mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
+             x:Class="Semi.Avalonia.Demo.Pages.WindowCustomizationsPage"
+             x:CompileBindings="True">
+
+    <StackPanel
+        Spacing="10"
+        IsEnabled="{OnFormFactor False, Desktop=True}">
+        <TextBlock Classes="H2" Text="Desktop properties" />
+
+        <CheckBox Content="Extend Client Area to Decorations"
+                  IsChecked="{Binding $parent[Window].ExtendClientAreaToDecorationsHint}" />
+
+        <Slider IsEnabled="{Binding $parent[Window].ExtendClientAreaToDecorationsHint}"
+                HorizontalAlignment="Left"
+                Width="201" Minimum="-1" Maximum="200"
+                Value="{Binding $parent[Window].ExtendClientAreaTitleBarHeightHint}" />
+
+        <CheckBox Content="Can Resize"
+                  IsChecked="{Binding $parent[Window].CanResize}" />
+
+        <CheckBox Content="Can Minimize"
+                  IsChecked="{Binding $parent[Window].CanMinimize}" />
+
+        <CheckBox Content="Can Maximize"
+                  IsChecked="{Binding $parent[Window].CanMaximize}"
+                  IsEnabled="{Binding $parent[Window].CanResize}" />
+    </StackPanel>
+</UserControl>
\ No newline at end of file
diff --git a/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml.cs b/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml.cs
new file mode 100644
index 0000000..27d9d98
--- /dev/null
+++ b/demo/Semi.Avalonia.Demo/Pages/WindowCustomizationsPage.axaml.cs
@@ -0,0 +1,12 @@
+using Avalonia.Controls;
+
+namespace Semi.Avalonia.Demo.Pages
+{
+    public partial class WindowCustomizationsPage : UserControl
+    {
+        public WindowCustomizationsPage()
+        {
+            InitializeComponent();
+        }
+    }
+}
diff --git a/demo/Semi.Avalonia.Demo/Views/MainView.axaml b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
index d8d48d0..b33d608 100644
--- a/demo/Semi.Avalonia.Demo/Views/MainView.axaml
+++ b/demo/Semi.Avalonia.Demo/Views/MainView.axaml
@@ -278,6 +278,9 @@
             <TabItem Header="ThemeVariantScope">
                 <pages:ThemeVariantDemo />
             </TabItem>
+            <TabItem Header="WindowCustomizationsPage">
+                <pages:WindowCustomizationsPage />
+            </TabItem>
         </TabControl>
     </Grid>
 </UserControl>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml b/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml
index fd7153c..637794f 100644
--- a/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Controls/WindowDrawnDecorations.axaml
@@ -7,7 +7,6 @@
         <Setter Property="Padding" Value="{StaticResource CaptionButtonPadding}" />
         <Setter Property="Width" Value="{StaticResource CaptionButtonWidth}" />
         <Setter Property="Height" Value="{StaticResource CaptionButtonHeight}" />
-        <Setter Property="Cursor" Value="Hand" />
         <Setter Property="WindowDecorationProperties.ElementRole" Value="DecorationsElement" />
         <Setter Property="Template">
             <ControlTemplate TargetType="Button">
@@ -39,6 +38,10 @@
         <Style Selector="^:pressed">
             <Setter Property="Background" Value="{DynamicResource CaptionButtonPressedBackground}" />
         </Style>
+
+        <Style Selector="^:disabled">
+            <Setter Property="Foreground" Value="{DynamicResource CaptionButtonDisabledForeground}" />
+        </Style>
     </ControlTheme>
 
     <ControlTheme x:Key="{x:Type WindowDrawnDecorations}" TargetType="WindowDrawnDecorations">
@@ -50,14 +53,13 @@
                 <WindowDrawnDecorationsContent>
                     <WindowDrawnDecorationsContent.Underlay>
                         <!--  Full-size: covers shadow area + frame + behind client area  -->
-                        <Panel>
+                        <Panel Name="PART_UnderlayWrapper">
                             <Border
                                 Name="PART_WindowBorder"
-                                Margin="{TemplateBinding ShadowThickness}"
                                 Background="{DynamicResource WindowBackground}"
                                 BorderBrush="{DynamicResource WindowBorderBrush}"
-                                BorderThickness="1"
-                                BoxShadow="{DynamicResource WindowBorderShadow}" />
+                                BorderThickness="{TemplateBinding FrameThickness}"
+                                IsHitTestVisible="False" />
                             <!-- Titlebar: background, title text, and drag area live in underlay -->
                             <Panel Name="PART_TitleBar"
                                    VerticalAlignment="Top"
@@ -81,7 +83,6 @@
                                 <TextBlock
                                     Margin="12,0,0,0"
                                     VerticalAlignment="Center"
-                                    FontSize="12"
                                     Text="{TemplateBinding Title}" />
                             </Panel>
                             <StackPanel
@@ -90,9 +91,7 @@
                                 HorizontalAlignment="Right"
                                 VerticalAlignment="Top"
                                 IsVisible="{TemplateBinding HasTitleBar}"
-                                Orientation="Horizontal"
-                                Spacing="2"
-                                TextElement.FontSize="10">
+                                Orientation="Horizontal">
                                 <Button
                                     Name="PART_FullScreenButton"
                                     Theme="{StaticResource CaptionButton}"
@@ -137,7 +136,7 @@
                                     WindowDecorationProperties.ElementRole="CloseButton" />
                             </StackPanel>
                             <TextBlock
-                                Margin="12,0"
+                                Margin="12,0,0,0"
                                 VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}" />
                         </DockPanel>
diff --git a/src/Semi.Avalonia/Themes/Dark/WindowDrawnDecorations.axaml b/src/Semi.Avalonia/Themes/Dark/WindowDrawnDecorations.axaml
index 2173028..277258f 100644
--- a/src/Semi.Avalonia/Themes/Dark/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/Dark/WindowDrawnDecorations.axaml
@@ -7,5 +7,6 @@
     <StaticResource x:Key="CaptionButtonCloseForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
     <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorDangerActive" />
-    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="CaptionButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/HighContrast/WindowDrawnDecorations.axaml b/src/Semi.Avalonia/Themes/HighContrast/WindowDrawnDecorations.axaml
index 2dcce3e..8e6efee 100644
--- a/src/Semi.Avalonia/Themes/HighContrast/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/HighContrast/WindowDrawnDecorations.axaml
@@ -7,4 +7,5 @@
     <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorHotlight" />
     <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorHotlight" />
     <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorWindowText" />
+    <StaticResource x:Key="CaptionButtonDisabledForeground" ResourceKey="SemiColorGrayText" />
 </ResourceDictionary>
\ No newline at end of file
diff --git a/src/Semi.Avalonia/Themes/Light/WindowDrawnDecorations.axaml b/src/Semi.Avalonia/Themes/Light/WindowDrawnDecorations.axaml
index 2173028..277258f 100644
--- a/src/Semi.Avalonia/Themes/Light/WindowDrawnDecorations.axaml
+++ b/src/Semi.Avalonia/Themes/Light/WindowDrawnDecorations.axaml
@@ -7,5 +7,6 @@
     <StaticResource x:Key="CaptionButtonCloseForeground" ResourceKey="SemiColorWhite" />
     <StaticResource x:Key="CaptionButtonClosePointeroverBackground" ResourceKey="SemiColorDangerPointerover" />
     <StaticResource x:Key="CaptionButtonClosePressedBackground" ResourceKey="SemiColorDangerActive" />
-    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText2" />
+    <StaticResource x:Key="CaptionButtonForeground" ResourceKey="SemiColorText1" />
+    <StaticResource x:Key="CaptionButtonDisabledForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>
\ No newline at end of file