Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion samples/BrowserTabTheme/App.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
2 changes: 1 addition & 1 deletion samples/BrowserTabTheme/MainWindow.axaml
Original file line number Diff line number Diff line change
Expand Up @@ -7,7 +7,7 @@
Background="{DynamicResource DockSurfaceHeaderBrush}"
ExtendClientAreaToDecorationsHint="True"
ExtendClientAreaTitleBarHeightHint="-1"
ExtendClientAreaChromeHints="PreferSystemChrome">
ExtendClientAreaChromeHints="Default, PreferSystemChrome, OSXThickTitleBar">
<DockControl Name="DockControl" Margin="6" />

</Window>
12 changes: 11 additions & 1 deletion src/Dock.Avalonia.Themes.Browser/Styles/BrowserTabAccents.axaml
Original file line number Diff line number Diff line change
@@ -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">
Expand Down Expand Up @@ -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"
Expand All @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -341,7 +341,8 @@
DockProperties.IsDockTarget="True"
DockProperties.ShowDockIndicatorOnly="True"
DockProperties.IndicatorDockOperation="Fill">
<DockableControl TrackingMode="Tab">
<DockableControl TrackingMode="Tab"
VerticalAlignment="{TemplateBinding VerticalContentAlignment}">
<DockPanel Background="Transparent">
<StackPanel Background="Transparent"
Orientation="Horizontal"
Expand Down
Loading