From 7a1e337ed522896ba363d107dfe57d1c7a796f08 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Wed, 18 Feb 2026 13:57:57 +0100
Subject: [PATCH 1/5] fluent: honor vertical content alignment in document tab
 item template

---
 .../Controls/DocumentTabStripItem.axaml                  | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml b/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml
index b1706620a..1045512a2 100644
--- a/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml
+++ b/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml
@@ -341,23 +341,30 @@
                   DockProperties.IsDockTarget="True"
                   DockProperties.ShowDockIndicatorOnly="True"
                   DockProperties.IndicatorDockOperation="Fill">
-            <DockableControl TrackingMode="Tab">
+            <DockableControl TrackingMode="Tab"
+                             VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
               <DockPanel Background="Transparent">
                 <StackPanel Background="Transparent"
+                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Orientation="Horizontal"
                             Spacing="{DynamicResource DockTabContentSpacing}">
                   <StackPanel Margin="{DynamicResource DockTabContentMargin}"
+                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               Orientation="Horizontal"
                               Spacing="{DynamicResource DockDocumentTabHeaderContentSpacing}">
                     <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].IconTemplate}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                       Content="{Binding}" />
                     <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].HeaderTemplate}"
+                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                       Content="{Binding}" />
                   </StackPanel>
                   <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].ModifiedTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     IsVisible="{Binding IsModified}"
                                     Content="{Binding}" />
                   <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].CloseTemplate}"
+                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Content="{Binding}" />
                 </StackPanel>
               </DockPanel>

From bc4cee95573cfe195df33bfd00d87826df30e822 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Wed, 18 Feb 2026 13:58:01 +0100
Subject: [PATCH 2/5] browser-theme: add macOS host chrome hints and platform
 header padding

---
 .../Styles/BrowserTabAccents.axaml                   | 12 +++++++++++-
 .../Styles/Controls/HostWindow.axaml                 |  2 +-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/src/Dock.Avalonia.Themes.Browser/Styles/BrowserTabAccents.axaml b/src/Dock.Avalonia.Themes.Browser/Styles/BrowserTabAccents.axaml
index e9be64834..e0efaeee7 100644
--- a/src/Dock.Avalonia.Themes.Browser/Styles/BrowserTabAccents.axaml
+++ b/src/Dock.Avalonia.Themes.Browser/Styles/BrowserTabAccents.axaml
@@ -1,6 +1,7 @@
 <ResourceDictionary xmlns="https://github.com/avaloniaui"
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:sys="clr-namespace:System;assembly=netstandard"
+                    xmlns:platform="clr-namespace:Avalonia.Platform;assembly=Avalonia.Controls"
                     xmlns:core="using:Dock.Model.Core">
   <ResourceDictionary.ThemeDictionaries>
     <ResourceDictionary x:Key="Default">
@@ -113,6 +114,11 @@
   <sys:Double x:Key="DockDocumentTabItemMinHeight">28</sys:Double>
   <sys:Double x:Key="DockToolTabItemMinHeight">0</sys:Double>
   <sys:Double x:Key="DockDocumentTabStripMinHeight">28</sys:Double>
+  <OnPlatform x:Key="DockHostWindowChromeHints"
+              x:TypeArguments="platform:ExtendClientAreaChromeHints"
+              Default="PreferSystemChrome"
+              macOS="Default, PreferSystemChrome, OSXThickTitleBar"
+              Windows="PreferSystemChrome" />
   <OnPlatform x:Key="DockDocumentTabStripLeadingSpacerWidth"
               x:TypeArguments="x:Double"
               Default="12"
@@ -134,7 +140,11 @@
   <sys:Double x:Key="DockChromeGripHeight">5</sys:Double>
   <Thickness x:Key="DockChromeGripMargin">0,0,2,0</Thickness>
   <SolidColorBrush x:Key="DockChromeGripBrush" Color="#00000000" />
-  <Thickness x:Key="DockHeaderContentPadding">2</Thickness>
+  <OnPlatform x:Key="DockHeaderContentPadding"
+              x:TypeArguments="Thickness"
+              Default="2"
+              macOS="2,1,2,0"
+              Windows="2" />
   <Thickness x:Key="DockModifiedIndicatorMargin">0,0,2,0</Thickness>
   <sys:Double x:Key="DockTabContentSpacing">2</sys:Double>
   <sys:Double x:Key="DockDocumentTabHeaderContentSpacing">5</sys:Double>
diff --git a/src/Dock.Avalonia.Themes.Browser/Styles/Controls/HostWindow.axaml b/src/Dock.Avalonia.Themes.Browser/Styles/Controls/HostWindow.axaml
index f900f515b..7d0c09274 100644
--- a/src/Dock.Avalonia.Themes.Browser/Styles/Controls/HostWindow.axaml
+++ b/src/Dock.Avalonia.Themes.Browser/Styles/Controls/HostWindow.axaml
@@ -30,7 +30,7 @@
     <Setter Property="ToolChromeControlsWholeWindow" Value="{Binding OpenedDockablesCount, Converter={StaticResource LessThan2}}" />
     <Setter Property="ExtendClientAreaToDecorationsHint" Value="True" />
     <Setter Property="ExtendClientAreaTitleBarHeightHint" Value="0" />
-    <Setter Property="ExtendClientAreaChromeHints" Value="PreferSystemChrome" />
+    <Setter Property="ExtendClientAreaChromeHints" Value="{DynamicResource DockHostWindowChromeHints}" />
 
     <Setter Property="Template">
       <ControlTemplate>

From 48222da1ebab5e5fbd66bea3bb43c86e3ddb0175 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Wed, 18 Feb 2026 13:58:05 +0100
Subject: [PATCH 3/5] browser-sample: align header padding and macOS titlebar
 chrome settings

---
 samples/BrowserTabTheme/App.axaml        | 4 +++-
 samples/BrowserTabTheme/MainWindow.axaml | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/samples/BrowserTabTheme/App.axaml b/samples/BrowserTabTheme/App.axaml
index bd8a1e192..5a939823c 100644
--- a/samples/BrowserTabTheme/App.axaml
+++ b/samples/BrowserTabTheme/App.axaml
@@ -36,7 +36,9 @@
     <Style Selector="DocumentControl">
       <Setter Property="HeaderTemplate">
         <DataTemplate DataType="core:IDockable" x:DataType="core:IDockable">
-          <TextBlock Text="{Binding Title}" VerticalAlignment="Center" Padding="2" />
+          <TextBlock Text="{Binding Title}"
+                     VerticalAlignment="Center"
+                     Padding="{DynamicResource DockHeaderContentPadding}" />
         </DataTemplate>
       </Setter>
     </Style>
diff --git a/samples/BrowserTabTheme/MainWindow.axaml b/samples/BrowserTabTheme/MainWindow.axaml
index 143124c52..b7c19b6a3 100644
--- a/samples/BrowserTabTheme/MainWindow.axaml
+++ b/samples/BrowserTabTheme/MainWindow.axaml
@@ -6,8 +6,8 @@
         Height="820"
         Background="{DynamicResource DockSurfaceHeaderBrush}"
         ExtendClientAreaToDecorationsHint="True"
-        ExtendClientAreaTitleBarHeightHint="-1"
-        ExtendClientAreaChromeHints="PreferSystemChrome">
+        ExtendClientAreaTitleBarHeightHint="32"
+        ExtendClientAreaChromeHints="Default, PreferSystemChrome, OSXThickTitleBar">
   <DockControl Name="DockControl" Margin="6" />
   
 </Window>

From 7aad31e4efda2acd28c629a5d06d52a082521c5c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Wed, 18 Feb 2026 14:02:06 +0100
Subject: [PATCH 4/5] fluent: keep single root vertical alignment binding for
 document tabs

---
 .../Controls/DocumentTabStripItem.axaml                     | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml b/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml
index 1045512a2..3297cbedb 100644
--- a/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml
+++ b/src/Dock.Avalonia.Themes.Fluent/Controls/DocumentTabStripItem.axaml
@@ -345,26 +345,20 @@
                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
               <DockPanel Background="Transparent">
                 <StackPanel Background="Transparent"
-                            VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                             Orientation="Horizontal"
                             Spacing="{DynamicResource DockTabContentSpacing}">
                   <StackPanel Margin="{DynamicResource DockTabContentMargin}"
-                              VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                               Orientation="Horizontal"
                               Spacing="{DynamicResource DockDocumentTabHeaderContentSpacing}">
                     <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].IconTemplate}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                       Content="{Binding}" />
                     <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].HeaderTemplate}"
-                                      VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                       Content="{Binding}" />
                   </StackPanel>
                   <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].ModifiedTemplate}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     IsVisible="{Binding IsModified}"
                                     Content="{Binding}" />
                   <ContentPresenter ContentTemplate="{Binding $parent[DocumentControl].CloseTemplate}"
-                                    VerticalAlignment="{TemplateBinding VerticalContentAlignment}"
                                     Content="{Binding}" />
                 </StackPanel>
               </DockPanel>

From 2dfbb9f71058573b7f9b0053f110ac667b8dbf13 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wies=C5=82aw=20=C5=A0olt=C3=A9s?=
 <wieslawsoltes@users.noreply.github.com>
Date: Wed, 18 Feb 2026 14:29:55 +0100
Subject: [PATCH 5/5] Update MainWindow.axaml

---
 samples/BrowserTabTheme/MainWindow.axaml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/samples/BrowserTabTheme/MainWindow.axaml b/samples/BrowserTabTheme/MainWindow.axaml
index b7c19b6a3..60b08025a 100644
--- a/samples/BrowserTabTheme/MainWindow.axaml
+++ b/samples/BrowserTabTheme/MainWindow.axaml
@@ -6,7 +6,7 @@
         Height="820"
         Background="{DynamicResource DockSurfaceHeaderBrush}"
         ExtendClientAreaToDecorationsHint="True"
-        ExtendClientAreaTitleBarHeightHint="32"
+        ExtendClientAreaTitleBarHeightHint="-1"
         ExtendClientAreaChromeHints="Default, PreferSystemChrome, OSXThickTitleBar">
   <DockControl Name="DockControl" Margin="6" />