ci: upgrade draft release version.

.github/workflows/release-tag.yml

@@ -63,7 +63,7 @@ jobs:
         run: ls -R
 
       - name: Release
-        uses: softprops/action-gh-release@v2
+        uses: softprops/action-gh-release@v3
         if: startsWith(github.ref, 'refs/tags/') || github.event_name == 'workflow_dispatch'
         with:
           generate_release_notes: true

demo/Semi.Avalonia.Demo/Converters/FileIconConverter.cs

@@ -1,28 +0,0 @@
-using System;
-using System.Collections.Generic;
-using System.Globalization;
-using Avalonia;
-using Avalonia.Data.Converters;
-using Avalonia.Metadata;
-
-namespace Semi.Avalonia.Demo.Converters;
-
-public class FileIconConverter : IMultiValueConverter
-{
-    [Content] public IDictionary<string, object?> Items { get; } = new Dictionary<string, object?>();
-
-    public object? Convert(IList<object?> values, Type targetType, object? parameter, CultureInfo culture)
-    {
-        if (values[0] is bool isDirectory && values[1] is bool isOpen)
-        {
-            if (!isDirectory)
-            {
-                return Items["file"];
-            }
-
-            return isOpen ? Items["folderOpen"] : Items["folderClosed"];
-        }
-
-        return AvaloniaProperty.UnsetValue;
-    }
-}

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

@@ -29,40 +29,40 @@
 
         <AutoCompleteBox
             PlaceholderText="Please select a State"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         <AutoCompleteBox
             Classes="Large"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         <AutoCompleteBox
             Classes="Small"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         <AutoCompleteBox
             Classes="Bordered"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         <AutoCompleteBox
             IsEnabled="False"
             PlaceholderText="Disabled"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         <AutoCompleteBox
             InnerLeftContent="https://"
             InnerRightContent=".com"
-            ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+            ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
 
         <StackPanel Orientation="Horizontal">
             <AutoCompleteBox
                 Width="100"
                 Classes="Large"
                 PlaceholderText="Large"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
             <AutoCompleteBox
                 Width="100"
                 PlaceholderText="Default"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
             <AutoCompleteBox
                 Width="100"
                 Classes="Small"
                 PlaceholderText="Small"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         </StackPanel>
 
         <StackPanel Orientation="Horizontal">
@@ -70,17 +70,17 @@
                 Width="100"
                 IsEnabled="False"
                 PlaceholderText="Disabled"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
             <AutoCompleteBox
                 Width="100"
                 Classes="Bordered"
                 PlaceholderText="Bordered"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
             <AutoCompleteBox
                 Width="100"
                 Classes="Bordered"
                 IsEnabled="False"
-                ValueMemberBinding="{Binding Name,DataType=vm:StateData}" />
+                ValueMemberBinding="{Binding Name,x:DataType=vm:StateData}" />
         </StackPanel>
 
     </StackPanel>

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

@@ -12,7 +12,7 @@
             <ScrollViewer DockPanel.Dock="Right" Width="260">
                 <StackPanel Margin="12" Spacing="8">
                     <TextBlock Text="Configuration" FontWeight="SemiBold" FontSize="16" />
-                    <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="14" />
+                    <TextBlock Text="Navigation" FontWeight="SemiBold" FontSize="13" />
 
                     <Button Content="Push Page"
                             HorizontalAlignment="Stretch"
@@ -26,20 +26,6 @@
 
                     <Separator />
 
-                    <TextBlock Text="Modal Actions" FontWeight="SemiBold" FontSize="14" />
-                    <Button Name="PushModalButton"
-                            Content="Push Modal"
-                            HorizontalAlignment="Stretch"
-                            Click="OnPushModal" />
-                    <Button Name="PopModalButton"
-                            Content="Pop Modal"
-                            HorizontalAlignment="Stretch"
-                            Click="OnPopModal" />
-                    <Button Name="PopAllModalsButton"
-                            Content="Pop All Modals"
-                            HorizontalAlignment="Stretch"
-                            Click="OnPopAllModals" />
-
                     <TextBlock Text="Options" FontWeight="SemiBold" FontSize="14" />
 
                     <CheckBox Name="HasNavBarCheck"
@@ -48,39 +34,21 @@
                               IsCheckedChanged="OnHasNavBarChanged" />
                     <CheckBox Name="HasBackButtonCheck"
                               Content="Has Back Button"
-                              IsChecked="True"
+                              IsChecked="True" 
-                              IsCheckedChanged="OnHasBackButtonChanged" />
+                              IsCheckedChanged="OnHasBackButonChanged" />
-                    <CheckBox Name="HasShadowCheck"
-                              Content="Has Shadow"
-                              IsChecked="True"
-                              IsCheckedChanged="OnHasShadowChanged" />
-                    <CheckBox Name="large" Content="Large" />
-
-                    <Separator />
-
-                    <TextBlock Text="Modal Transition" FontWeight="SemiBold" FontSize="14" />
-                    <ComboBox Name="TransitionCombo"
-                              SelectedIndex="0"
-                              HorizontalAlignment="Stretch"
-                              SelectionChanged="OnTransitionChanged">
-                        <ComboBoxItem Content="Slide from Bottom" />
-                        <ComboBoxItem Content="CrossFade" />
-                        <ComboBoxItem Content="None" />
-                    </ComboBox>
 
                     <Separator />
 
                     <TextBlock Text="Status" FontWeight="SemiBold" FontSize="14" />
                     <TextBlock Name="StatusText"
                                Text="Depth: 1"
+                               Opacity="0.7"
                                TextWrapping="Wrap" />
                     <TextBlock Name="HeaderText"
                                Text="Current: Home"
+                               Opacity="0.7"
                                TextWrapping="Wrap" />
-                    <TextBlock Name="ModalText"
+                    <ToggleSwitch Content="Large" Name="large" />
-                               Text="Modals: 0"
-                               TextWrapping="Wrap" />
-
                 </StackPanel>
             </ScrollViewer>
 
@@ -91,8 +59,8 @@
                     BorderThickness="1"
                     CornerRadius="6"
                     ClipToBounds="True">
-                <NavigationPage
+                <NavigationPage 
-                    Name="DemoNav"
+                    Name="DemoNav" 
                     Classes.Large="{Binding #large.IsChecked}" />
             </Border>
         </DockPanel>

demo/Semi.Avalonia.Demo/Pages/NavigationPageDemo.axaml.cs

@@ -1,5 +1,3 @@
-using System;
-using Avalonia.Animation;
 using Avalonia.Controls;
 using Avalonia.Interactivity;
 
@@ -8,7 +6,6 @@ namespace Semi.Avalonia.Demo.Pages;
 public partial class NavigationPageDemo : UserControl
 {
     private int _pageCount;
-    private int _modalCount;
 
     public NavigationPageDemo()
     {
@@ -18,7 +15,7 @@ public partial class NavigationPageDemo : UserControl
 
     private async void OnLoaded(object? sender, RoutedEventArgs e)
     {
-        await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Home", "Welcome!\nUse the buttons to push and pop pages/modals.", 0), null);
+        await DemoNav.PushAsync(NavigationDemoHelper.MakePage("Home", "Welcome!\nUse the buttons to push and pop pages.", 0), null);
         UpdateStatus();
     }
 
@@ -45,27 +42,6 @@ public partial class NavigationPageDemo : UserControl
         UpdateStatus();
     }
 
-    private async void OnPushModal(object? sender, RoutedEventArgs e)
-    {
-        _modalCount++;
-        var modal = NavigationDemoHelper.MakePage($"Modal {_modalCount}", "This page was presented modally.\nTap 'Pop Modal' to dismiss.", _modalCount);
-        await DemoNav.PushModalAsync(modal);
-        UpdateStatus();
-    }
-
-    private async void OnPopModal(object? sender, RoutedEventArgs e)
-    {
-        await DemoNav.PopModalAsync();
-        UpdateStatus();
-    }
-
-    private async void OnPopAllModals(object? sender, RoutedEventArgs e)
-    {
-        await DemoNav.PopAllModalsAsync();
-        _modalCount = 0;
-        UpdateStatus();
-    }
-
     private void OnHasNavBarChanged(object? sender, RoutedEventArgs e)
     {
         if (DemoNav == null)
@@ -74,7 +50,7 @@ public partial class NavigationPageDemo : UserControl
             NavigationPage.SetHasNavigationBar(DemoNav.CurrentPage, HasNavBarCheck.IsChecked == true);
     }
 
-    private void OnHasBackButtonChanged(object? sender, RoutedEventArgs e)
+    private void OnHasBackButonChanged(object? sender, RoutedEventArgs e)
     {
         if (DemoNav == null)
             return;
@@ -82,30 +58,9 @@ public partial class NavigationPageDemo : UserControl
             NavigationPage.SetHasBackButton(DemoNav.CurrentPage, HasBackButtonCheck.IsChecked == true);
     }
 
-    private void OnHasShadowChanged(object? sender, RoutedEventArgs e)
-    {
-        if (DemoNav == null)
-            return;
-        if (DemoNav.CurrentPage != null)
-            DemoNav.HasShadow = HasShadowCheck.IsChecked == true;
-    }
-
-    private void OnTransitionChanged(object? sender, SelectionChangedEventArgs e)
-    {
-        if (DemoNav == null)
-            return;
-        DemoNav.ModalTransition = TransitionCombo.SelectedIndex switch
-        {
-            1 => new CrossFade(TimeSpan.FromMilliseconds(250)),
-            2 => null,
-            _ => new PageSlide(TimeSpan.FromMilliseconds(300), PageSlide.SlideAxis.Vertical)
-        };
-    }
-
     private void UpdateStatus()
     {
         StatusText.Text = $"Depth: {DemoNav.StackDepth}";
         HeaderText.Text = $"Current: {DemoNav.CurrentPage?.Header ?? "(none)"}";
-        ModalText.Text = $"Modals: {DemoNav.ModalStack.Count}";
     }
 }

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

@@ -50,7 +50,7 @@
             <TabbedPage Name="DemoTabs"
                         TabPlacement="Top"
                         SelectionChanged="OnSelectionChanged">
-                <ContentPage Icon="{DynamicResource SemiIconHome}" Header="Home">
+                <ContentPage Header="Home">
                     <StackPanel Margin="16" Spacing="8">
                         <TextBlock Text="Home Tab" FontSize="24" FontWeight="Bold" />
                         <TextBlock Text="Welcome to the Home tab. This is a TabbedPage sample."
@@ -59,14 +59,14 @@
                                    TextWrapping="Wrap" Opacity="0.7" />
                     </StackPanel>
                 </ContentPage>
-                <ContentPage Icon="{DynamicResource SemiIconSearch}" Header="Search">
+                <ContentPage Header="Search">
                     <StackPanel Margin="16" Spacing="8">
                         <TextBlock Text="Search Tab" FontSize="24" FontWeight="Bold" />
                         <TextBox PlaceholderText="Type to search..." />
                         <TextBlock Text="Search results will appear here." Opacity="0.7" />
                     </StackPanel>
                 </ContentPage>
-                <ContentPage Icon="{DynamicResource SemiIconSetting}" Header="Settings">
+                <ContentPage Header="Settings">
                     <StackPanel Margin="16" Spacing="8">
                         <TextBlock Text="Settings Tab" FontSize="24" FontWeight="Bold" />
                         <CheckBox Content="Enable notifications" />

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

@@ -3,8 +3,7 @@
              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:Class="Semi.Avalonia.Demo.Pages.WindowCustomizationsPage">
-             x:CompileBindings="True">
 
     <StackPanel
         Spacing="10"

demo/Semi.Avalonia.Demo/Semi.Avalonia.Demo.csproj

@@ -3,7 +3,6 @@
         <TargetFramework>net8.0</TargetFramework>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
-        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
     <ItemGroup>

src/Directory.Build.props

@@ -2,7 +2,6 @@
     <PropertyGroup>
         <Nullable>enable</Nullable>
         <LangVersion>latest</LangVersion>
-        <AvaloniaUseCompiledBindingsByDefault>true</AvaloniaUseCompiledBindingsByDefault>
     </PropertyGroup>
 
     <PropertyGroup Condition="$([MSBuild]::IsTargetFrameworkCompatible('$(TargetFramework)', 'net8.0'))">

src/Semi.Avalonia.DataGrid/DataGrid.axaml

@@ -1,8 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:collections="using:Avalonia.Collections"
+    xmlns:collections="using:Avalonia.Collections">
-    x:CompileBindings="True">
     <ControlTheme x:Key="DataGridCellTextBlockTheme" TargetType="TextBlock">
         <Setter Property="Margin" Value="{DynamicResource DataGridCellTextBlockDefaultMargin}" />
         <Setter Property="VerticalAlignment" Value="Center" />

src/Semi.Avalonia.TreeDataGrid/TreeDataGrid.axaml

@@ -1,8 +1,7 @@
 <ResourceDictionary
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
-    xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls.TreeDataGrid"
+    xmlns:conv="clr-namespace:Avalonia.Controls.Converters;assembly=Avalonia.Controls.TreeDataGrid">
-    x:CompileBindings="True">
     <Design.PreviewWith>
         <StackPanel Margin="20">
             <TreeDataGridColumnHeader Header="123" />

src/Semi.Avalonia/Controls/NavigationPage.axaml

@@ -8,26 +8,6 @@
     <ControlTheme x:Key="{x:Type NavigationPage}" TargetType="NavigationPage">
         <Setter Property="Background" Value="Transparent" />
         <Setter Property="BarHeight" Value="{DynamicResource NavigationPageBarMinHeight}" />
-        <Setter Property="PageTransition">
-            <PageSlide Duration="0:0:0.3" Orientation="Horizontal" FillMode="Forward">
-                <PageSlide.SlideInEasing>
-                    <SplineEasing X1="0.16" Y1="1" X2="0.3" Y2="1" />
-                </PageSlide.SlideInEasing>
-                <PageSlide.SlideOutEasing>
-                    <SplineEasing X1="0.2" Y1="0.85" X2="0.3" Y2="1" />
-                </PageSlide.SlideOutEasing>
-            </PageSlide>
-        </Setter>
-        <Setter Property="ModalTransition">
-            <PageSlide Duration="0:0:0.25" Orientation="Vertical" FillMode="Forward">
-                <PageSlide.SlideInEasing>
-                    <SplineEasing X1="0.16" Y1="1" X2="0.3" Y2="1" />
-                </PageSlide.SlideInEasing>
-                <PageSlide.SlideOutEasing>
-                    <SplineEasing X1="0.2" Y1="0.85" X2="0.3" Y2="1" />
-                </PageSlide.SlideOutEasing>
-            </PageSlide>
-        </Setter>
         <Setter Property="Template">
             <ControlTemplate TargetType="NavigationPage">
                 <Panel ClipToBounds="True">
@@ -135,7 +115,7 @@
         <Style Selector="^:nav-bar-compact /template/ ContentPresenter#PART_TopCommandBar CommandBar">
             <Setter Property="DefaultLabelPosition" Value="Collapsed" />
         </Style>
-
+        
         <Style Selector="^.Large">
             <Setter Property="BarHeight" Value="{DynamicResource NavigationPageBarLargeMinHeight}" />
         </Style>

src/Semi.Avalonia/Controls/SplitView.axaml

@@ -1,7 +1,6 @@
 <ResourceDictionary 
     xmlns="https://github.com/avaloniaui" 
-    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
+    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-    x:CompileBindings="True">
     <ControlTheme x:Key="{x:Type SplitView}" TargetType="SplitView">
         <Setter Property="OpenPaneLength" Value="{DynamicResource SplitViewOpenPaneThemeLength}" />
         <Setter Property="CompactPaneLength" Value="{DynamicResource SplitViewCompactPaneThemeLength}" />

src/Semi.Avalonia/Controls/TabItem.axaml

@@ -31,6 +31,7 @@
                     <DockPanel HorizontalSpacing="{DynamicResource TabItemIconHeaderSpacing}">
                         <ContentPresenter
                             Name="PART_IconPresenter"
+                            DockPanel.Dock="Left"
                             Content="{TemplateBinding Icon}"
                             ContentTemplate="{TemplateBinding IconTemplate}"
                             IsVisible="{Binding $self.Content, Converter={x:Static ObjectConverters.IsNotNull}}">
@@ -60,10 +61,6 @@
             <Setter Property="RecognizesAccessKey" Value="True" />
         </Style>
 
-        <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-            <Setter Property="DockPanel.Dock" Value="Left" />
-        </Style>
-
         <Style Selector="^:selected">
             <Style Selector="^ /template/ ContentPresenter#PART_HeaderPresenter">
                 <Setter Property="FontWeight" Value="{DynamicResource TabItemSelectedFontWeight}" />

src/Semi.Avalonia/Controls/TabbedPage.axaml

@@ -2,11 +2,7 @@
     xmlns="https://github.com/avaloniaui"
     xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
     <Design.PreviewWith>
-        <TabbedPage Width="400" Height="800" TabPlacement="Bottom">
+        <TabbedPage Width="400" Height="300" />
-            <ContentPage Icon="{DynamicResource SemiIconHome}" Header="Home" />
-            <ContentPage Icon="{DynamicResource SemiIconSearch}" Header="Search" />
-            <ContentPage Icon="{DynamicResource SemiIconSetting}" Header="Settings" />
-        </TabbedPage>
     </Design.PreviewWith>
 
     <ControlTheme x:Key="{x:Type TabbedPage}" TargetType="TabbedPage">
@@ -15,91 +11,27 @@
                 <TabControl
                     Name="PART_TabControl"
                     Background="{TemplateBinding Background}"
-                    Theme="{StaticResource LineTabControl}">
+                    Theme="{StaticResource LineTabControl}" />
-                    <TabControl.ItemContainerTheme>
-                        <ControlTheme
-                            BasedOn="{StaticResource LineTabItem}"
-                            TargetType="TabItem">
-                            <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
-                                <Setter Property="TabItem.Margin" Value="0" />
-                                <Setter Property="TabItem.HorizontalContentAlignment" Value="Center" />
-                                <Setter Property="TabItem.VerticalContentAlignment" Value="Center" />
-                                <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                                    <Setter Property="DockPanel.Dock" Value="Top" />
-                                </Style>
-                            </Style>
-                        </ControlTheme>
-                    </TabControl.ItemContainerTheme>
-                    <TabControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <UniformGrid Columns="{Binding $parent[TabControl].ItemCount}" />
-                        </ItemsPanelTemplate>
-                    </TabControl.ItemsPanel>
-                </TabControl>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-
     <ControlTheme x:Key="CardTabbedPage" TargetType="TabbedPage">
         <Setter Property="Template">
             <ControlTemplate TargetType="TabbedPage">
                 <TabControl
                     Name="PART_TabControl"
                     Background="{TemplateBinding Background}"
-                    Theme="{StaticResource CardTabControl}">
+                    Theme="{StaticResource CardTabControl}" />
-                    <TabControl.ItemContainerTheme>
-                        <ControlTheme
-                            BasedOn="{StaticResource CardTabItem}"
-                            TargetType="TabItem">
-                            <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
-                                <Setter Property="TabItem.Padding" Value="8" />
-                                <Setter Property="TabItem.Margin" Value="0" />
-                                <Setter Property="TabItem.HorizontalContentAlignment" Value="Center" />
-                                <Setter Property="TabItem.VerticalContentAlignment" Value="Center" />
-                                <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                                    <Setter Property="DockPanel.Dock" Value="Top" />
-                                </Style>
-                            </Style>
-                        </ControlTheme>
-                    </TabControl.ItemContainerTheme>
-                    <TabControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <UniformGrid Columns="{Binding $parent[TabControl].ItemCount}" />
-                        </ItemsPanelTemplate>
-                    </TabControl.ItemsPanel>
-                </TabControl>
             </ControlTemplate>
         </Setter>
     </ControlTheme>
-
     <ControlTheme x:Key="ButtonTabbedPage" TargetType="TabbedPage">
         <Setter Property="Template">
             <ControlTemplate TargetType="TabbedPage">
                 <TabControl
                     Name="PART_TabControl"
                     Background="{TemplateBinding Background}"
-                    Theme="{StaticResource ButtonTabControl}">
+                    Theme="{StaticResource ButtonTabControl}" />
-                    <TabControl.ItemContainerTheme>
-                        <ControlTheme
-                            BasedOn="{StaticResource ButtonTabItem}"
-                            TargetType="TabItem">
-                            <Style Selector="^[TabStripPlacement=Top], ^[TabStripPlacement=Bottom]">
-                                <Setter Property="TabItem.Padding" Value="12" />
-                                <Setter Property="TabItem.Margin" Value="0" />
-                                <Setter Property="TabItem.HorizontalContentAlignment" Value="Center" />
-                                <Setter Property="TabItem.VerticalContentAlignment" Value="Center" />
-                                <Style Selector="^ /template/ ContentPresenter#PART_IconPresenter">
-                                    <Setter Property="DockPanel.Dock" Value="Top" />
-                                </Style>
-                            </Style>
-                        </ControlTheme>
-                    </TabControl.ItemContainerTheme>
-                    <TabControl.ItemsPanel>
-                        <ItemsPanelTemplate>
-                            <UniformGrid Columns="{Binding $parent[TabControl].ItemCount}" />
-                        </ItemsPanelTemplate>
-                    </TabControl.ItemsPanel>
-                </TabControl>
             </ControlTemplate>
         </Setter>
     </ControlTheme>