chore: Adjust for invalid XAML

unoplatform · May 10, 2023 · 6b14d4d · 6b14d4d
1 parent 444056d
commit 6b14d4d
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 2 deletions.
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/TabView.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/TabView.xaml
@@ -194,7 +194,7 @@
                             IsHorizontalRailEnabled="False"
                             IsHorizontalScrollChainingEnabled="False"
                             IsVerticalRailEnabled="False"
-                            IsVerticalScrollChainingEnabled="{False"
+                            IsVerticalScrollChainingEnabled="False"
                             TabNavigation="{TemplateBinding TabNavigation}"
                             VerticalScrollBarVisibility="Disabled"
                             VerticalScrollMode="Disabled"

diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -22691,7 +22691,8 @@
                 </VisualState>
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
-            <ScrollViewer x:Name="ScrollViewer" Grid.Column="1" AutomationProperties.AccessibilityView="Raw" BringIntoViewOnFocusChange="{TemplateBinding ScrollViewer.BringIntoViewOnFocusChange}" HorizontalScrollBarVisibility="{TemplateBinding ScrollViewer.HorizontalScrollBarVisibility}" HorizontalScrollMode="{TemplateBinding ScrollViewer.HorizontalScrollMode}" IsDeferredScrollingEnabled="{TemplateBinding ScrollViewer.IsDeferredScrollingEnabled}" IsHorizontalRailEnabled="{TemplateBinding ScrollViewer.IsHorizontalRailEnabled}" IsHorizontalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsHorizontalScrollChainingEnabled}" IsVerticalRailEnabled="{TemplateBinding ScrollViewer.IsVerticalRailEnabled}" IsVerticalScrollChainingEnabled="{TemplateBinding ScrollViewer.IsVerticalScrollChainingEnabled}" TabNavigation="{TemplateBinding TabNavigation}" VerticalScrollBarVisibility="{TemplateBinding ScrollViewer.VerticalScrollBarVisibility}" VerticalScrollMode="{TemplateBinding ScrollViewer.VerticalScrollMode}" ZoomMode="{TemplateBinding ScrollViewer.ZoomMode}" Style="{StaticResource TabScrollViewerStyle}">
+            <!-- TODO: Uno specific: Original template uses attached property template bindings (issue #4259) -->
+            <ScrollViewer x:Name="ScrollViewer" Grid.Column="1" AutomationProperties.AccessibilityView="Raw" BringIntoViewOnFocusChange="True" HorizontalScrollBarVisibility="Auto" HorizontalScrollMode="Enabled" IsDeferredScrollingEnabled="False" IsHorizontalRailEnabled="False" IsHorizontalScrollChainingEnabled="False" IsVerticalRailEnabled="False" IsVerticalScrollChainingEnabled="False" TabNavigation="{TemplateBinding TabNavigation}" VerticalScrollBarVisibility="Disabled" VerticalScrollMode="Disabled" ZoomMode="Disabled" Style="{StaticResource TabScrollViewerStyle}">
               <ItemsPresenter x:Name="TabsItemsPresenter" Padding="{TemplateBinding Padding}">
                 <ItemsPresenter.Header>
                   <Grid Width="4">
@@ -22711,6 +22712,8 @@
     </Setter>
   </Style>
   <Style x:Name="TabScrollViewerStyle" TargetType="ScrollViewer">
+    <!--Uno workaround: ScrollBars are deliberately omitted from the style because they shouldn't appear-->
+    <Setter Property="uno:ScrollViewer.ShouldFallBackToNativeScrollBars" Value="False" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="ScrollViewer">
@@ -22868,6 +22871,9 @@
   <Style TargetType="controls:TabViewItem">
     <Setter Property="Background" Value="{ThemeResource TabViewItemHeaderBackground}" />
     <Setter Property="HorizontalContentAlignment" Value="Left" />
+    <!-- TODO: Uno specific: This is a temporary workaround for TabView items stretching vertically
+		Can be removed when #1133 is fixed.-->
+    <ios:Setter Property="MinHeight" Value="32" />
     <Setter Property="UseSystemFocusVisuals" Value="{StaticResource UseSystemFocusVisuals}" />
     <Setter Property="MinHeight" Value="{ThemeResource TabViewItemMinHeight}" />
     <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource OverlayCornerRadius}" />