Fix tabview over-expansion bug

Author: lukeblevins

Files UWP/InstanceTabsView.xaml

@@ -96,19 +96,30 @@
                                 </Grid.ColumnDefinitions>
                                 <ContentPresenter x:Name="LeftContentPresenter" ContentTemplate="{TemplateBinding TabStripHeaderTemplate}" Content="{TemplateBinding TabStripHeader}" Grid.Column="0"/>
                                 <primitiveContract7Present:TabViewListView x:Name="TabListView" AllowDrop="{TemplateBinding AllowDropTabs}" CanReorderItems="{TemplateBinding CanReorderTabs}" Grid.Column="1" CanDragItems="{TemplateBinding CanDragTabs}" ItemTemplate="{TemplateBinding TabItemTemplate}" ItemsSource="{TemplateBinding TabItemsSource}" ItemTemplateSelector="{TemplateBinding TabItemTemplateSelector}"/>
-                                <Button x:Name="AddButton" Command="{TemplateBinding AddTabButtonCommand}" CommandParameter="{TemplateBinding AddTabButtonCommandParameter}" Content="&#xE710;" Grid.Column="2" Style="{StaticResource TabViewButtonStyle}" Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource Mode=TemplatedParent}}"/>
+                                <Button x:Name="AddButton" Command="{TemplateBinding AddTabButtonCommand}" CommandParameter="{TemplateBinding AddTabButtonCommandParameter}" Content="&#xE710;" Grid.Column="2" Style="{StaticResource TabViewButtonStyle}" Visibility="{Binding IsAddTabButtonVisible, RelativeSource={RelativeSource Mode=TemplatedParent}}" HorizontalAlignment="Stretch" VerticalAlignment="Stretch"/>
                                 <Grid Background="Transparent" Name="DragArea" Loaded="DragArea_Loaded" Grid.Column="3"/>
+
                             </Grid>
-                            <ContentPresenter x:Name="TabContentPresenter" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Grid.Row="1"/>
+                            <!--<ContentPresenter x:Name="TabContentPresenter" BorderThickness="{TemplateBinding BorderThickness}" BorderBrush="{TemplateBinding BorderBrush}" Grid.Row="1"/>-->
                         </Grid>
                     </ControlTemplate>
                 </Setter.Value>
             </Setter>
         </Style>
     </Page.Resources>
 
-    <Grid Name="rootGrid" Background="Transparent">
-        <uilib:TabView Background="{StaticResource SystemControlAcrylicWindowBrush}" AddTabButtonClick="TabStrip_AddTabButtonClick" Style="{StaticResource TabViewStyleFixed}" SelectionChanged="TabStrip_SelectionChanged"  TabCloseRequested="TabStrip_TabCloseRequested" CanDragTabs="False" AllowDropTabs="False" Grid.ColumnSpan="3" CanReorderTabs="True" Name="TabStrip" TabWidthMode="Equal" VerticalAlignment="Stretch">
+    <Grid Background="{StaticResource SystemControlAcrylicWindowBrush}"  Name="rootGrid" >
+        <Grid.RowDefinitions>
+            <RowDefinition Height="Auto"/>
+            <RowDefinition Height="*"/>
+        </Grid.RowDefinitions>
+        <Grid.ColumnDefinitions>
+            <ColumnDefinition Width="*"/>
+            <ColumnDefinition Width="175"/>
+        </Grid.ColumnDefinitions>
+        <ContentPresenter Background="{StaticResource ApplicationPageBackgroundThemeBrush}" x:Name="ContentPresenter" Grid.Row="1" Grid.ColumnSpan="2" Content="{x:Bind ((uilib:TabViewItem)(local:InstanceTabsView).TabStrip.SelectedItem).Content, Mode=OneWay}"/>
+
+        <uilib:TabView Background="Transparent" Grid.Row="0" AddTabButtonClick="TabStrip_AddTabButtonClick" Style="{StaticResource TabViewStyleFixed}" SelectionChanged="TabStrip_SelectionChanged"  TabCloseRequested="TabStrip_TabCloseRequested" CanDragTabs="False" AllowDropTabs="False" CanReorderTabs="True" Name="TabStrip" TabWidthMode="Equal" VerticalAlignment="Stretch">
             <uilib:TabView.Resources>
                 <ResourceDictionary>
                     <ResourceDictionary.ThemeDictionaries>

Files UWP/InstanceTabsView.xaml.cs

@@ -19,7 +19,6 @@ namespace Files
     public sealed partial class InstanceTabsView : Page
     {
         public TabView tabView;
-        public List<Type> types = new List<Type>();
         public InstanceTabsView()
         {
             this.InitializeComponent();
@@ -236,6 +235,7 @@ private void TabStrip_SelectionChanged(object sender, SelectionChangedEventArgs
                     }
                 }
             }
+
         }
 
         private void TabStrip_TabCloseRequested(Microsoft.UI.Xaml.Controls.TabView sender, Microsoft.UI.Xaml.Controls.TabViewTabCloseRequestedEventArgs args)
@@ -258,13 +258,4 @@ private void TabStrip_AddTabButtonClick(TabView sender, object args)
         }
     }
 
-    public class InstanceTabItem
-    {
-        public string HeaderText { get; set; }
-        public string SourcePage { get; set; }
-        public int index { get; set; }
-        public Frame TabContent { get; set; }
-
-
-    }
 }