TabView Miscellaneous Fixes (#6598)

* add min width for columns containing LeftBottomBorderLine * update test page with TabStripHeader * fix testpage * fix add conditional case for selected tab * revert changes to test page
microsoft · Jan 20, 2022 · 4a3921b · 4a3921b
1 parent 6351666
commit 4a3921b
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/dev/TabView/TabView.cpp b/dev/TabView/TabView.cpp
@@ -288,7 +288,11 @@ void TabView::UpdateTabBottomBorderLineVisualStates()
         }
         else if (selectedIndex != -1)
         {
-            if (i == selectedIndex - 1)
+            if (i == selectedIndex)
+            {
+                state = L"NoBottomBorderLine";
+            }
+            else if (i == selectedIndex - 1)
             {
                 state = L"LeftOfSelectedTab";
             }

diff --git a/dev/TabView/TabView.xaml b/dev/TabView/TabView.xaml
@@ -43,7 +43,7 @@
                                 XYFocusKeyboardNavigation="Enabled">
 
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" x:Name="LeftContentColumn"/>
+                                <ColumnDefinition Width="Auto" MinWidth="2"  x:Name="LeftContentColumn"/>
                                 <ColumnDefinition Width="Auto" x:Name="TabColumn"/>
                                 <ColumnDefinition Width="Auto" x:Name="AddButtonColumn"/>
                                 <ColumnDefinition Width="*" x:Name="RightContentColumn"/>
@@ -241,7 +241,7 @@
 
                         <Grid>
                             <Grid.ColumnDefinitions>
-                                <ColumnDefinition Width="Auto" />
+                                <ColumnDefinition Width="Auto" MinWidth="2" />
                                 <ColumnDefinition Width="*" />
                                 <ColumnDefinition Width="Auto" />
                             </Grid.ColumnDefinitions>