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.

demo/Semi.Avalonia.Demo/Pages/ButtonSpinnerDemo.axaml

@@ -35,5 +35,30 @@
                 VerticalAlignment="Center"
                 Text="A.S.I.A" />
         </ButtonSpinner>
+        <ButtonSpinner
+            Height="30"
+            AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+            BorderThickness="1"
+            ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}"
+            Spin="OnSpin"
+            Theme="{StaticResource SplitButtonSpinner}">
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="A.S.I.A" />
+        </ButtonSpinner>
+        <ButtonSpinner
+            Height="30"
+            AllowSpin="{Binding #allowSpinCheck.IsChecked}"
+            ButtonSpinnerLocation="Left"
+            BorderThickness="1"
+            ShowButtonSpinner="{Binding #showSpinCheck.IsChecked}"
+            Spin="OnSpin"
+            Theme="{StaticResource SplitButtonSpinner}">
+            <TextBlock
+                HorizontalAlignment="Center"
+                VerticalAlignment="Center"
+                Text="A.S.I.A" />
+        </ButtonSpinner>
     </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/NumericUpDownDemo.axaml

@@ -51,6 +51,11 @@
             <NumericUpDown Width="100" IsEnabled="False" />
             <NumericUpDown Width="100" ButtonSpinnerLocation="Left" />
         </StackPanel>
+        
+        <StackPanel>
+            <TextBlock Text="Split" />
+            <NumericUpDown Classes="Split" Width="300" />
+        </StackPanel>
 
     </StackPanel>
 </UserControl>

demo/Semi.Avalonia.Demo/Pages/TabControlDemo.axaml

@@ -34,14 +34,10 @@
                         </StackPanel>
                         <Border MinHeight="150" Theme="{StaticResource CardBorder}">
                             <TabControl Classes.ReverseSeparator="{Binding #reverse.IsChecked}" TabStripPlacement="{Binding #place.SelectedValue}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
+                                <TabItem Content="Hello 1" Header="文档" Icon="{StaticResource SemiIconFile}" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
+                                <TabItem Content="Hello 2" Header="快速起步" Icon="{StaticResource SemiIconGlobe}" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
+                                <TabItem Content="Hello 4" Header="无效" Icon="{StaticResource SemiIconClear}" IsEnabled="False" />
-                                <TabItem Content="中文内容" Header="中文中文" />
+                                <TabItem Content="Hello 3" Header="帮助" Icon="{StaticResource SemiIconHelpCircle}" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
                             </TabControl>
                         </Border>
                         <Border Height="300" Theme="{StaticResource CardBorder}">
@@ -57,14 +53,10 @@
                     <StackPanel>
                         <Border MinHeight="150" Theme="{StaticResource CardBorder}">
                             <TabControl TabStripPlacement="{Binding #place.SelectedValue}" Theme="{StaticResource LineTabControl}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
+                                <TabItem Content="Hello 1" Header="文档" Icon="{StaticResource SemiIconFile}" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
+                                <TabItem Content="Hello 2" Header="快速起步" Icon="{StaticResource SemiIconGlobe}" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
+                                <TabItem Content="Hello 4" Header="无效" Icon="{StaticResource SemiIconClear}" IsEnabled="False" />
-                                <TabItem Content="中文内容" Header="中文中文" />
+                                <TabItem Content="Hello 3" Header="帮助" Icon="{StaticResource SemiIconHelpCircle}" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
                             </TabControl>
                         </Border>
                         <Border Height="300" Theme="{StaticResource CardBorder}">
@@ -82,14 +74,10 @@
                             Background="Transparent"
                             Theme="{StaticResource CardBorder}">
                             <TabControl TabStripPlacement="{Binding #place.SelectedValue}" Theme="{StaticResource CardTabControl}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
+                                <TabItem Content="Hello 1" Header="文档" Icon="{StaticResource SemiIconFile}" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
+                                <TabItem Content="Hello 2" Header="快速起步" Icon="{StaticResource SemiIconGlobe}" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
+                                <TabItem Content="Hello 4" Header="无效" Icon="{StaticResource SemiIconClear}" IsEnabled="False" />
-                                <TabItem Content="中文内容" Header="中文中文" />
+                                <TabItem Content="Hello 3" Header="帮助" Icon="{StaticResource SemiIconHelpCircle}" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
                             </TabControl>
                         </Border>
                         <Border
@@ -107,14 +95,10 @@
                     <StackPanel>
                         <Border MinHeight="150" Theme="{StaticResource CardBorder}">
                             <TabControl TabStripPlacement="{Binding #place.SelectedValue}" Theme="{StaticResource ButtonTabControl}">
-                                <TabItem Content="Hello 1" Header="Tab 1" />
+                                <TabItem Content="Hello 1" Header="文档" Icon="{StaticResource SemiIconFile}" />
-                                <TabItem Content="Hello 2" Header="Tab 2" />
+                                <TabItem Content="Hello 2" Header="快速起步" Icon="{StaticResource SemiIconGlobe}" />
-                                <TabItem Content="Hello 3" Header="Tab 3" />
+                                <TabItem Content="Hello 4" Header="无效" Icon="{StaticResource SemiIconClear}" IsEnabled="False" />
-                                <TabItem Content="中文内容" Header="中文中文" />
+                                <TabItem Content="Hello 3" Header="帮助" Icon="{StaticResource SemiIconHelpCircle}" />
-                                <TabItem
-                                    Content="Hello 4"
-                                    Header="Tab 4"
-                                    IsEnabled="False" />
                             </TabControl>
                         </Border>
                         <Border Height="300" Theme="{StaticResource CardBorder}">

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>

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();
+        }
+    }
+}

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>

demo/Semi.Avalonia.Demo/Views/MainWindow.axaml

@@ -9,7 +9,6 @@
     d:DesignHeight="450"
     d:DesignWidth="800"
     ExtendClientAreaToDecorationsHint="True"
-    ExtendClientAreaTitleBarHeightHint="40"
     Icon="/Assets/irihi.ico"
     mc:Ignorable="d">
     <views:MainView Margin="{Binding $parent[Window].WindowDecorationMargin}" />

demo/Semi.Avalonia.Demo/Views/MainWindow.axaml.cs

@@ -1,11 +1,38 @@
 using Avalonia.Controls;
+using Avalonia.Input;
 
 namespace Semi.Avalonia.Demo.Views;
 
 public partial class MainWindow : Window
 {
+    private WindowState _stateBeforeFullScreen = WindowState.Normal;
+
     public MainWindow()
     {
         InitializeComponent();
+        KeyDown += FullScreenKeyDown;
+    }
+
+    private void FullScreenKeyDown(object? sender, KeyEventArgs e)
+    {
+        if (e.Key == Key.F11)
+        {
+            
+            ToggleFullScreen();
+            e.Handled = true;
+        }
+    }
+
+    private void ToggleFullScreen()
+    {
+        if (WindowState is not WindowState.FullScreen)
+        {
+            _stateBeforeFullScreen = WindowState;
+            WindowState = WindowState.FullScreen;
+        }
+        else
+        {
+            WindowState = _stateBeforeFullScreen;
+        }
     }
 }

src/Semi.Avalonia/Controls/ButtonSpinner.axaml

@@ -20,6 +20,7 @@
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
                     Content="{TemplateBinding Content}"
+                    CornerRadius="{TemplateBinding CornerRadius}"
                     ContentTemplate="{TemplateBinding ContentTemplate}" />
             </ControlTemplate>
         </Setter>
@@ -92,7 +93,7 @@
                 </Grid>
             </ControlTemplate>
         </Setter>
-        <Style Selector="^[ButtonSpinnerLocation=Left] /template/ Border#ButtonGroup">
+        <Style Selector="^:left /template/ Border#ButtonGroup">
             <Setter Property="Grid.Column" Value="0" />
             <Setter Property="Margin" Value="0 0 4 0" />
         </Style>
@@ -100,4 +101,70 @@
             <Setter Property="BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonPointeroverBorderBrush}" />
         </Style>
     </ControlTheme>
+
+    <ControlTheme x:Key="SplitButtonSpinner" TargetType="ButtonSpinner">
+        <Setter Property="BorderBrush" Value="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}" />
+        <Setter Property="BorderThickness" Value="0" />
+        <Setter Property="MinWidth" Value="200" />
+        <Setter Property="Template">
+            <ControlTemplate TargetType="ButtonSpinner">
+                <Grid ColumnDefinitions="Auto, *, Auto">
+                    <RepeatButton
+                        Name="PART_DecreaseButton"
+                        Grid.Column="0"
+                        VerticalAlignment="Stretch"
+                        Padding="{DynamicResource SplitButtonSpinnerButtonPadding}"
+                        BorderBrush="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}"
+                        BorderThickness="{DynamicResource ButtonSpinnerButtonGroupBorderThickness}"
+                        CornerRadius="{DynamicResource SplitButtonSpinnerLeftButtonCornerRadius}"
+                        IsVisible="{TemplateBinding ShowButtonSpinner}"
+                        Theme="{StaticResource ButtonSpinnerRepeatButton}">
+                        <PathIcon
+                            Theme="{DynamicResource InnerPathIcon}"
+                            Classes="Small"
+                            Data="{DynamicResource SplitButtonSpinnerDecreaseButtonGlyph}"
+                            Foreground="{DynamicResource ButtonSpinnerRepeatButtonForeground}" />
+                    </RepeatButton>
+                    <Border
+                        Grid.Column="1"
+                        Margin="2 0"
+                        BorderBrush="{TemplateBinding BorderBrush}"
+                        BorderThickness="{TemplateBinding BorderThickness}"
+                        CornerRadius="{TemplateBinding CornerRadius}">
+                        <ContentPresenter
+                            Name="PART_ContentPresenter"
+                            Padding="{TemplateBinding Padding}"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Content}"
+                            ContentTemplate="{TemplateBinding ContentTemplate}" />
+                    </Border>
+                    <RepeatButton
+                        Name="PART_IncreaseButton"
+                        Grid.Column="2"
+                        VerticalAlignment="Stretch"
+                        Padding="{DynamicResource SplitButtonSpinnerButtonPadding}"
+                        BorderBrush="{DynamicResource ButtonSpinnerRepeatButtonBorderBrush}"
+                        BorderThickness="{DynamicResource ButtonSpinnerButtonGroupBorderThickness}"
+                        CornerRadius="{DynamicResource SplitButtonSpinnerRightButtonCornerRadius}"
+                        IsVisible="{TemplateBinding ShowButtonSpinner}"
+                        Theme="{StaticResource ButtonSpinnerRepeatButton}">
+                        <PathIcon
+                            Theme="{DynamicResource InnerPathIcon}"
+                            Classes="Small"
+                            Data="{DynamicResource SplitButtonSpinnerIncreaseButtonGlyph}"
+                            Foreground="{DynamicResource ButtonSpinnerRepeatButtonForeground}" />
+                    </RepeatButton>
+                </Grid>
+            </ControlTemplate>
+        </Setter>
+        <Style Selector="^:left /template/ RepeatButton#PART_DecreaseButton">
+            <Setter Property="Grid.Column" Value="2" />
+            <Setter Property="CornerRadius" Value="{DynamicResource SplitButtonSpinnerRightButtonCornerRadius}" />
+        </Style>
+        <Style Selector="^:left /template/ RepeatButton#PART_IncreaseButton">
+            <Setter Property="Grid.Column" Value="0" />
+            <Setter Property="CornerRadius" Value="{DynamicResource SplitButtonSpinnerLeftButtonCornerRadius}" />
+        </Style>
+    </ControlTheme>
 </ResourceDictionary>

src/Semi.Avalonia/Controls/NumericUpDown.axaml

@@ -52,6 +52,15 @@
         <Style Selector="^.Small">
             <Setter Property="MinHeight" Value="{DynamicResource NumericUpDownSmallHeight}" />
         </Style>
+        
+        <Style Selector="^.Split">
+            <Style Selector="^ /template/ ButtonSpinner#PART_Spinner">
+                <Setter Property="Theme" Value="{DynamicResource SplitButtonSpinner}" />
+            </Style>
+            <Style Selector="^ /template/ TextBox#PART_TextBox">
+                <Setter Property="CornerRadius" Value="0" />
+            </Style>
+        </Style>
 
         <Style Selector="^:error">
             <Style Selector="^ /template/ TextBox#PART_TextBox">

src/Semi.Avalonia/Controls/TabItem.axaml

@@ -6,16 +6,12 @@
             Width="400"
             Height="400"
             Margin="20">
+            <TabItem Theme="{DynamicResource CardTabItem}" Header="文档" Icon="{StaticResource SemiIconFile}" />
             <TabControl TabStripPlacement="Top" Theme="{DynamicResource LineTabControl}">
-                <TabItem Header="文档">
+                <TabItem Content="Hello 1" Header="文档" Icon="{StaticResource SemiIconFile}" />
-                    <TextBlock Text="Content1" />
+                <TabItem Content="Hello 2" Header="快速起步" Icon="{StaticResource SemiIconGlobe}" />
-                </TabItem>
+                <TabItem Content="Hello 4" Header="无效" Icon="{StaticResource SemiIconClear}" IsEnabled="False" />
-                <TabItem Header="快速起步">
+                <TabItem Content="Hello 3" Header="帮助" Icon="{StaticResource SemiIconHelpCircle}" />
-                    <TextBlock Text="Content2" />
-                </TabItem>
-                <TabItem Header="帮助" IsSelected="True">
-                    <TextBlock Text="Content3" />
-                </TabItem>
             </TabControl>
         </StackPanel>
     </Design.PreviewWith>
@@ -25,20 +21,39 @@
         <Setter Property="Background" Value="{DynamicResource TabItemLinePipeBackground}" />
         <Setter Property="Template">
             <ControlTemplate TargetType="TabItem">
-                <ContentPresenter
+                <Border
-                    Name="PART_HeaderPresenter"
+                    Name="PART_RootBorder"
                     Padding="{TemplateBinding Padding}"
-                    HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
-                    VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
                     Background="{TemplateBinding Background}"
                     BorderBrush="{TemplateBinding BorderBrush}"
                     BorderThickness="{TemplateBinding BorderThickness}"
-                    Content="{TemplateBinding Header}"
+                    CornerRadius="{TemplateBinding CornerRadius}">
-                    ContentTemplate="{TemplateBinding HeaderTemplate}"
+                    <DockPanel HorizontalSpacing="{DynamicResource TabItemIconHeaderSpacing}">
-                    CornerRadius="{TemplateBinding CornerRadius}"
+                        <ContentPresenter
-                    FontFamily="{TemplateBinding FontFamily}"
+                            Name="PART_IconPresenter"
-                    FontWeight="{TemplateBinding FontWeight}"
+                            DockPanel.Dock="Left"
-                    Foreground="{TemplateBinding Foreground}" />
+                            Content="{TemplateBinding Icon}"
+                            ContentTemplate="{TemplateBinding IconTemplate}"
+                            IsVisible="{Binding $self.Content, Converter={x:Static ObjectConverters.IsNotNull}}">
+                            <ContentPresenter.DataTemplates>
+                                <DataTemplate DataType="Geometry">
+                                    <PathIcon
+                                        Theme="{StaticResource InnerPathIcon}"
+                                        Data="{Binding}" />
+                                </DataTemplate>
+                            </ContentPresenter.DataTemplates>
+                        </ContentPresenter>
+                        <ContentPresenter
+                            Name="PART_HeaderPresenter"
+                            HorizontalContentAlignment="{TemplateBinding HorizontalContentAlignment}"
+                            VerticalContentAlignment="{TemplateBinding VerticalContentAlignment}"
+                            Content="{TemplateBinding Header}"
+                            ContentTemplate="{TemplateBinding HeaderTemplate}"
+                            FontFamily="{TemplateBinding FontFamily}"
+                            FontWeight="{TemplateBinding FontWeight}"
+                            Foreground="{TemplateBinding Foreground}" />
+                    </DockPanel>
+                </Border>
             </ControlTemplate>
         </Setter>
 
@@ -46,17 +61,31 @@
             <Setter Property="RecognizesAccessKey" Value="True" />
         </Style>
 
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+        <Style Selector="^:selected">
-            <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
-            <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderSelectedForeground}" />
+                <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />
+                <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderSelectedForeground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TabItemIconSelectedForeground}" />
+            </Style>
         </Style>
 
         <Style Selector="^:not(:selected)">
             <Setter Property="Cursor" Value="Hand" />
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pointerover">
-                <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
+                <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter,^ /template/ ContentPresenter#PART_IconPresenter">
+                    <Setter Property="Foreground" Value="{DynamicResource TabItemLineHeaderPointeroverForeground}" />
+                </Style>
             </Style>
         </Style>
+
+        <Style Selector="^:disabled">
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter,^ /template/ ContentPresenter#PART_IconPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TabItemHeaderDisabledForeground}" />
+            </Style>
+        </Style>
+
     </ControlTheme>
 
     <ControlTheme
@@ -65,15 +94,15 @@
         TargetType="TabItem">
         <Setter Property="Padding" Value="8 4" />
 
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+        <Style Selector="^:selected /template/ Border#PART_RootBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
         </Style>
 
         <Style Selector="^:not(:selected)">
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pointerover /template/ Border#PART_RootBorder">
                 <Setter Property="BorderBrush" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pressed /template/ Border#PART_RootBorder">
                 <Setter Property="BorderBrush" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
             </Style>
         </Style>
@@ -98,27 +127,27 @@
         x:Key="LineTabItem"
         BasedOn="{StaticResource BaseTabItem}"
         TargetType="TabItem">
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+        <Style Selector="^:selected /template/ Border#PART_RootBorder">
             <Setter Property="BorderBrush" Value="{DynamicResource TabItemLinePipeSelectedBackground}" />
         </Style>
         <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
-            <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:selected /template/ Border#PART_RootBorder">
                 <Setter Property="Background" Value="{DynamicResource TabItemLineHeaderSelectedBackground}" />
             </Style>
         </Style>
 
         <Style Selector="^:not(:selected)">
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pointerover /template/ Border#PART_RootBorder">
                 <Setter Property="BorderBrush" Value="{DynamicResource TabItemLinePipePointeroverBorderBrush}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pressed /template/ Border#PART_RootBorder">
                 <Setter Property="BorderBrush" Value="{DynamicResource TabItemLinePipePressedBorderBrush}" />
             </Style>
             <Style Selector="^[TabStripPlacement=Left], ^[TabStripPlacement=Right]">
-                <Style Selector="^:pointerover /template/ ContentPresenter#PART_HeaderPresenter">
+                <Style Selector="^:pointerover /template/ Border#PART_RootBorder">
                     <Setter Property="Background" Value="{DynamicResource TabItemLineHeaderPointeroverBackground}" />
                 </Style>
-                <Style Selector="^:pressed /template/ ContentPresenter#PART_HeaderPresenter">
+                <Style Selector="^:pressed /template/ Border#PART_RootBorder">
                     <Setter Property="Background" Value="{DynamicResource TabItemLineHeaderPressedBackground}" />
                 </Style>
             </Style>
@@ -150,15 +179,15 @@
         TargetType="TabItem">
         <Setter Property="BorderBrush" Value="{DynamicResource TabControlSeparatorBorderBrush}" />
 
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+        <Style Selector="^:selected /template/ Border#PART_RootBorder">
             <Setter Property="Background" Value="{DynamicResource TabItemCardHeaderSelectedBackground}" />
         </Style>
 
         <Style Selector="^:not(:selected)">
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pointerover /template/ Border#PART_RootBorder">
                 <Setter Property="Background" Value="{DynamicResource TabItemCardHeaderPointeroverBackground}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pressed /template/ Border#PART_RootBorder">
                 <Setter Property="Background" Value="{DynamicResource TabItemCardHeaderPressedBackground}" />
             </Style>
         </Style>
@@ -207,16 +236,20 @@
         TargetType="TabItem">
         <Setter Property="CornerRadius" Value="{DynamicResource SemiBorderRadiusSmall}" />
 
-        <Style Selector="^:selected /template/ ContentPresenter#PART_HeaderPresenter">
+        <Style Selector="^:selected">
-            <Setter Property="Foreground" Value="{DynamicResource TabItemButtonHeaderSelectedForeground}" />
+            <Style Selector="^ /template/ Border#PART_RootBorder">
-            <Setter Property="Background" Value="{DynamicResource TabItemButtonHeaderSelectedBackground}" />
+                <Setter Property="Background" Value="{DynamicResource TabItemButtonHeaderSelectedBackground}" />
+            </Style>
+            <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
+                <Setter Property="Foreground" Value="{DynamicResource TabItemButtonHeaderSelectedForeground}" />
+            </Style>
         </Style>
 
         <Style Selector="^:not(:selected)">
-            <Style Selector="^:pointerover /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pointerover /template/ Border#PART_RootBorder">
                 <Setter Property="Background" Value="{DynamicResource TabItemButtonHeaderPointeroverBackground}" />
             </Style>
-            <Style Selector="^:pressed /template/ ContentPresenter#PART_HeaderPresenter">
+            <Style Selector="^:pressed /template/ Border#PART_RootBorder">
                 <Setter Property="Background" Value="{DynamicResource TabItemButtonHeaderPressedBackground}" />
             </Style>
         </Style>

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"
+                                BorderThickness="{TemplateBinding FrameThickness}"
-                                BoxShadow="{DynamicResource WindowBorderShadow}" />
+                                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"
+                                Orientation="Horizontal">
-                                Spacing="2"
-                                TextElement.FontSize="10">
                                 <Button
                                     Name="PART_FullScreenButton"
                                     Theme="{StaticResource CaptionButton}"
@@ -120,8 +119,9 @@
                     <WindowDrawnDecorationsContent.FullscreenPopover>
                         <!--  Shown on hover at top edge in fullscreen  -->
                         <DockPanel
-                            Height="{TemplateBinding TitleBarHeight}"
+                            Height="{TemplateBinding DefaultTitleBarHeight}"
                             Background="{DynamicResource TitleBarBackground}"
+                            VerticalAlignment="Top"
                             WindowDecorationProperties.ElementRole="TitleBar">
                             <StackPanel DockPanel.Dock="Right" Orientation="Horizontal">
                                 <Button
@@ -136,7 +136,7 @@
                                     WindowDecorationProperties.ElementRole="CloseButton" />
                             </StackPanel>
                             <TextBlock
-                                Margin="12,0"
+                                Margin="12,0,0,0"
                                 VerticalAlignment="Center"
                                 Text="{TemplateBinding Title}" />
                         </DockPanel>

src/Semi.Avalonia/Themes/Dark/TabItem.axaml

@@ -19,4 +19,7 @@
     <StaticResource x:Key="TabItemButtonHeaderSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
     <StaticResource x:Key="TabItemButtonHeaderPointeroverBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="TabItemButtonHeaderPressedBackground" ResourceKey="SemiColorFill1" />
+
+    <StaticResource x:Key="TabItemIconSelectedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="TabItemHeaderDisabledForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>

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>

src/Semi.Avalonia/Themes/HighContrast/TabItem.axaml

@@ -19,4 +19,7 @@
     <StaticResource x:Key="TabItemButtonHeaderSelectedBackground" ResourceKey="SemiColorHighlightText" />
     <StaticResource x:Key="TabItemButtonHeaderPointeroverBackground" ResourceKey="SemiColorHighlightText" />
     <StaticResource x:Key="TabItemButtonHeaderPressedBackground" ResourceKey="SemiColorHighlightText" />
+
+    <StaticResource x:Key="TabItemIconSelectedForeground" ResourceKey="SemiColorHighlight" />
+    <StaticResource x:Key="TabItemHeaderDisabledForeground" ResourceKey="SemiColorGrayText" />
 </ResourceDictionary>

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>

src/Semi.Avalonia/Themes/Light/TabItem.axaml

@@ -19,4 +19,7 @@
     <StaticResource x:Key="TabItemButtonHeaderSelectedBackground" ResourceKey="SemiColorPrimaryLight" />
     <StaticResource x:Key="TabItemButtonHeaderPointeroverBackground" ResourceKey="SemiColorFill0" />
     <StaticResource x:Key="TabItemButtonHeaderPressedBackground" ResourceKey="SemiColorFill1" />
+
+    <StaticResource x:Key="TabItemIconSelectedForeground" ResourceKey="SemiColorPrimary" />
+    <StaticResource x:Key="TabItemHeaderDisabledForeground" ResourceKey="SemiColorDisabledText" />
 </ResourceDictionary>

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>

src/Semi.Avalonia/Themes/Shared/ButtonSpinner.axaml

@@ -3,4 +3,10 @@
     <StaticResource x:Key="ButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconChevronDown" />
     <StaticResource x:Key="ButtonSpinnerButtonGroupCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <StaticResource x:Key="ButtonSpinnerButtonGroupBorderThickness" ResourceKey="SemiBorderThicknessControl" />
+
+    <StaticResource x:Key="SplitButtonSpinnerIncreaseButtonGlyph" ResourceKey="SemiIconPlus" />
+    <StaticResource x:Key="SplitButtonSpinnerDecreaseButtonGlyph" ResourceKey="SemiIconMinus" />
+    <CornerRadius x:Key="SplitButtonSpinnerLeftButtonCornerRadius">3 0 0 3</CornerRadius>
+    <CornerRadius x:Key="SplitButtonSpinnerRightButtonCornerRadius">0 3 3 0</CornerRadius>
+    <Thickness x:Key="SplitButtonSpinnerButtonPadding">8 0</Thickness>
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/TabItem.axaml

@@ -1,4 +1,5 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
+    <StaticResource x:Key="TabItemIconHeaderSpacing" ResourceKey="SemiSpacingTight" />
     <StaticResource x:Key="TabItemSelectedFontWeight" ResourceKey="SemiFontWeightBold" />
     <StaticResource x:Key="TabItemCardDefaultHeight" ResourceKey="SemiHeightControlDefault" />
 </ResourceDictionary>

src/Semi.Avalonia/Themes/Shared/WindowDrawnDecorations.axaml

@@ -1,10 +1,15 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui" xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    <StreamGeometry x:Key="WindowCloseIconGlyph">M13.46,12L19,17.54V19H17.54L12,13.46L6.46,19H5V17.54L10.54,12L5,6.46V5H6.46L12,10.54L17.54,5H19V6.46L13.46,12Z</StreamGeometry>
+    <StaticResource x:Key="WindowCloseIconGlyph" ResourceKey="SemiIconClose" />
-    <StreamGeometry x:Key="WindowMaximizeGlyph">M4,4H20V20H4V4M6,8V18H18V8H6Z</StreamGeometry>
+    <StaticResource x:Key="WindowMinimizeGlyph" ResourceKey="SemiIconMinus" />
-    <StreamGeometry x:Key="WindowMinimizeGlyph">M20,14H4V10H20</StreamGeometry>
+    <StaticResource x:Key="WindowExpandGlyph" ResourceKey="SemiIconExpand" />
-    <StreamGeometry x:Key="WindowRestoreGlyph">M4,8H8V4H20V16H16V20H4V8M16,8V14H18V6H10V8H16M6,12V18H14V12H6Z</StreamGeometry>
+    <StaticResource x:Key="WindowCollapseGlyph" ResourceKey="SemiIconShrink" />
-    <StreamGeometry x:Key="WindowExpandGlyph">M10,21V19H6.41L10.91,14.5L9.5,13.09L5,17.59V14H3V21H10M14.5,10.91L19,6.41V10H21V3H14V5H17.59L13.09,9.5L14.5,10.91Z</StreamGeometry>
+
-    <StreamGeometry x:Key="WindowCollapseGlyph">M19.5,3.09L15,7.59V4H13V11H20V9H16.41L20.91,4.5L19.5,3.09M4,13V15H7.59L3.09,19.5L4.5,20.91L9,16.41V20H11V13H4Z</StreamGeometry>
+    <StreamGeometry x:Key="WindowMaximizeGlyph">
+        M5 5.5A.5.5 0 015.5 5h13a.5.5 0 01.5.5v13a.5.5 0 01-.5.5H5.5A.5.5 0 015 18.5V5.5Zm-3 0v13A3.5 3.5 0 005.5 22h13A3.5 3.5 0 0022 18.5V5A3.5 3.5 0 0018.5 2H5.5A3.5 3.5 0 002 5.5Z
+    </StreamGeometry>
+    <StreamGeometry x:Key="WindowRestoreGlyph">
+        M3 9A2 2 0 015 7H15a2 2 0 012 2V19a2 2 0 01-2 2H5A2 2 0 013 19V9Zm3 1v8h8V10H6ZM7 4c0-1.1.9-2 2-2h11a2 2 0 012 2v11a2 2 0 01-2 2h-1V5H7V4Z
+    </StreamGeometry>
 
     <StaticResource x:Key="CaptionButtonCornerRadius" ResourceKey="SemiBorderRadiusSmall" />
     <StaticResource x:Key="CaptionButtonWidth" ResourceKey="SemiSpacingExtraLoose" />