Update DocumentTabTemplate.axaml

src/PixiEditor.AvaloniaUI/Styles/Templates/DocumentTabTemplate.axaml

@@ -2,24 +2,37 @@
                     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
                     xmlns:controls="clr-namespace:PixiDocks.Avalonia.Controls"
                     xmlns:docking="clr-namespace:PixiDocks.Core.Docking;assembly=PixiDocks.Core"
-                    xmlns:dock="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Dock">
+                    xmlns:dock="clr-namespace:PixiEditor.AvaloniaUI.ViewModels.Dock"
+                    xmlns:helpers="clr-namespace:PixiDocks.Avalonia.Helpers;assembly=PixiDocks.Avalonia">
 
     <DataTemplate DataType="dock:DocumentTabCustomizationSettings" x:Key="{x:Type dock:DocumentTabCustomizationSettings}">
-        <DockPanel LastChildFill="False" Margin="5, 0">
+        <Grid Margin="5, 0">
+            <Grid.Resources>
+                <helpers:ConditionToSizeConverter x:Key="ConditionToSizeConverter"/>
+            </Grid.Resources>
+            <Grid.ColumnDefinitions>
+                <ColumnDefinition Width="{Binding Icon,
+                Converter={StaticResource ConditionToSizeConverter}, ConverterParameter=20}"/>
+                <ColumnDefinition Width="*"/>
+                <ColumnDefinition Width="{Binding !IsSaved,
+                Converter={StaticResource ConditionToSizeConverter}, ConverterParameter=8}"/>
+                <ColumnDefinition Width="{Binding ShowCloseButton,
+                Converter={StaticResource ConditionToSizeConverter}, ConverterParameter=20}"/>
+            </Grid.ColumnDefinitions>
             <Image IsVisible="{Binding !!Icon}" Source="{Binding Icon}"
                    VerticalAlignment="Center"
                    RenderOptions.BitmapInterpolationMode="None"
                    DockPanel.Dock="Left" Width="16" Height="16"/>
-            <TextBlock Padding="5" DockPanel.Dock="Left" Foreground="{DynamicResource ThemeForegroundBrush}"
+            <TextBlock Grid.Column="1" Padding="5" DockPanel.Dock="Left" Foreground="{DynamicResource ThemeForegroundBrush}"
                        VerticalAlignment="Center"
                        Text="{Binding $parent[ContentControl].Tag.Title, FallbackValue=TITLE}"/>
-            <Ellipse Width="5" Height="5" Fill="White" IsVisible="{Binding !IsSaved}"/>
-            <Button Classes="CloseTabButton"
+            <Ellipse Grid.Column="2" Width="5" Height="5" Fill="White" IsVisible="{Binding !IsSaved}"/>
+            <Button Grid.Column="3" Classes="CloseTabButton"
                     Height="16" Width="16" Margin="5, 0, 0, 0"
                     VerticalAlignment="Center"
                     Command="{Binding $parent[ContentControl].Tag.CloseDockable}"
                     IsVisible="{Binding ShowCloseButton}"
                     IsEnabled="{Binding $parent[ContentControl].Tag.CanClose}"/>
-        </DockPanel>
+        </Grid>
     </DataTemplate>
 </ResourceDictionary>