feat: Update InfoBar to winui3/release/1.4.2

eriklimakc · Oct 25, 2023 · a075182 · a075182
1 parent 69abdbf
commit a075182
Show file tree

Hide file tree

Showing 13 changed files with 856 additions and 1,008 deletions.
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/InfoBar.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/InfoBar.xaml
diff --git a/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/InfoBar_themeresources.xaml b/src/Uno.UI.FluentTheme.v2/Resources/Version2/PriorityDefault/InfoBar_themeresources.xaml
diff --git a/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml b/src/Uno.UI.FluentTheme.v2/themeresources_v2.xaml
@@ -16531,12 +16531,12 @@
     <Setter Property="BorderBrush" Value="{ThemeResource InfoBarBorderBrush}" />
     <Setter Property="BorderThickness" Value="{ThemeResource InfoBarBorderThickness}" />
     <Setter Property="AutomationProperties.LandmarkType" Value="Custom" />
-    <contract7Present:Setter Property="AutomationProperties.IsDialog" Value="True" />
-    <contract7Present:Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
+    <Setter Property="AutomationProperties.IsDialog" Value="True" />
+    <Setter Property="CornerRadius" Value="{ThemeResource ControlCornerRadius}" />
     <Setter Property="Template">
       <Setter.Value>
         <ControlTemplate TargetType="controls:InfoBar">
-          <Border x:Name="ContentRoot" VerticalAlignment="Top" Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}">
+          <Border x:Name="ContentRoot" VerticalAlignment="Top" Background="{ThemeResource InfoBarInformationalSeverityBackgroundBrush}" BorderBrush="{TemplateBinding BorderBrush}" BorderThickness="{TemplateBinding BorderThickness}" CornerRadius="{TemplateBinding CornerRadius}">
             <VisualStateManager.VisualStateGroups>
               <VisualStateGroup x:Name="SeverityLevels">
                 <VisualState x:Name="Informational" />
@@ -16607,7 +16607,7 @@
               </VisualStateGroup>
             </VisualStateManager.VisualStateGroups>
             <!-- Background is used here so that it overrides the severity status color if set. -->
-            <Grid HorizontalAlignment="Stretch" MinHeight="{ThemeResource InfoBarMinHeight}" Background="{TemplateBinding Background}" contract7Present:CornerRadius="{TemplateBinding CornerRadius}" Padding="{StaticResource InfoBarContentRootPadding}">
+            <Grid HorizontalAlignment="Stretch" MinHeight="{ThemeResource InfoBarMinHeight}" Background="{TemplateBinding Background}" CornerRadius="{TemplateBinding CornerRadius}" Padding="{StaticResource InfoBarContentRootPadding}">
               <Grid.ColumnDefinitions>
                 <ColumnDefinition Width="Auto" />
                 <!-- Icon -->