Fix: Fixed high contrast support in menu flyouts (#14664)

0x5bfa · web-flow · commit 9914ebb274aa · 2024-02-09T07:40:56.000-08:00
diff --git a/src/Files.App/App.xaml b/src/Files.App/App.xaml
@@ -26,6 +26,15 @@
 			<CornerRadius x:Key="GridViewThumbnailCornerRadius">2</CornerRadius>
 			<CornerRadius x:Key="DetailsLayoutThumbnailCornerRadius">2</CornerRadius>
 
+			<!--  Workaround for https://github.com/files-community/Files/issues/13078  -->
+			<Style TargetType="FlyoutPresenter">
+				<Setter Target="HighContrastAdjustment" Value="None" />
+			</Style>
+
+			<Style TargetType="MenuFlyoutPresenter">
+				<Setter Target="HighContrastAdjustment" Value="None" />
+			</Style>
+
 			<ResourceDictionary.MergedDictionaries>
 				<XamlControlsResources xmlns="using:Microsoft.UI.Xaml.Controls" />
 
diff --git a/src/Files.App/Dialogs/PropertiesDialog.xaml b/src/Files.App/Dialogs/PropertiesDialog.xaml
diff --git a/src/Files.App/Dialogs/PropertiesDialog.xaml.cs b/src/Files.App/Dialogs/PropertiesDialog.xaml.cs
diff --git a/src/Files.App/Dialogs/ReleaseNotesDialog.xaml b/src/Files.App/Dialogs/ReleaseNotesDialog.xaml
@@ -78,7 +78,7 @@
 		<Border
 			Grid.Row="2"
 			Padding="12"
-			Background="{ThemeResource SolidBackgroundFillColorBase}"
+			Background="{ThemeResource SolidBackgroundFillColorBaseBrush}"
 			BackgroundSizing="OuterBorderEdge"
 			BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
 			BorderThickness="0,1,0,0">
diff --git a/src/Files.App/Dialogs/SettingsDialog.xaml b/src/Files.App/Dialogs/SettingsDialog.xaml
@@ -30,7 +30,7 @@
 	<Grid
 		x:Name="ContainerGrid"
 		MaxHeight="790"
-		Background="{ThemeResource SolidBackgroundFillColorBase}">
+		Background="{ThemeResource SolidBackgroundFillColorBaseBrush}">
 		<Grid.RowDefinitions>
 			<RowDefinition Height="44" />
 			<RowDefinition Height="*" />
diff --git a/src/Files.App/UserControls/DataGridHeader.xaml b/src/Files.App/UserControls/DataGridHeader.xaml
@@ -64,7 +64,7 @@
 									<VisualState x:Name="PointerOver">
 										<Storyboard>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="Background">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ControlAltFillColorTertiary}" />
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ControlAltFillColorTertiaryBrush}" />
 											</ObjectAnimationUsingKeyFrames>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ContentPresenter" Storyboard.TargetProperty="BorderBrush">
 												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ButtonBorderBrushPointerOver}" />
diff --git a/src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml b/src/Files.App/UserControls/Menus/MenuFlyoutItemWithImage.xaml
@@ -8,6 +8,7 @@
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	d:DesignHeight="300"
 	d:DesignWidth="400"
+	HighContrastAdjustment="None"
 	mc:Ignorable="d">
 
 	<MenuFlyoutItem.Style>
diff --git a/src/Files.App/UserControls/PathBreadcrumb.xaml b/src/Files.App/UserControls/PathBreadcrumb.xaml
@@ -100,6 +100,8 @@
 								<MenuFlyout.MenuFlyoutPresenterStyle>
 									<Style TargetType="MenuFlyoutPresenter">
 										<Setter Property="MaxHeight" Value="400" />
+										<!--  Workaround for https://github.com/files-community/Files/issues/13078  -->
+										<Setter Target="HighContrastAdjustment" Value="None" />
 									</Style>
 								</MenuFlyout.MenuFlyoutPresenterStyle>
 							</MenuFlyout>
diff --git a/src/Files.App/UserControls/SideBar/SideBarControls.xaml b/src/Files.App/UserControls/SideBar/SideBarControls.xaml
@@ -142,7 +142,7 @@
 								VerticalAlignment="Center"
 								AnimatedIcon.State="NormalOff"
 								AutomationProperties.AccessibilityView="Raw"
-								Foreground="{ThemeResource TextFillColorSecondary}"
+								Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 								RenderTransformOrigin="0.5, 0.5"
 								Visibility="Collapsed">
 								<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
diff --git a/src/Files.App/Views/HomePage.xaml b/src/Files.App/Views/HomePage.xaml
@@ -231,7 +231,7 @@
 										Height="12"
 										AnimatedIcon.State="NormalOff"
 										AutomationProperties.AccessibilityView="Raw"
-										Foreground="{ThemeResource TextFillColorSecondary}"
+										Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 										RenderTransformOrigin="0.5, 0.5">
 										<animatedvisuals:AnimatedChevronUpDownSmallVisualSource />
 										<AnimatedIcon.FallbackIconSource>
@@ -271,7 +271,7 @@
 												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBackground}" />
 											</ObjectAnimationUsingKeyFrames>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondary}" />
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondaryBrush}" />
 											</ObjectAnimationUsingKeyFrames>
 										</Storyboard>
 									</VisualState>
@@ -341,7 +341,7 @@
 												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource ExpanderChevronBackground}" />
 											</ObjectAnimationUsingKeyFrames>
 											<ObjectAnimationUsingKeyFrames Storyboard.TargetName="ExpandCollapseChevron" Storyboard.TargetProperty="Foreground">
-												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondary}" />
+												<DiscreteObjectKeyFrame KeyTime="0" Value="{ThemeResource TextFillColorSecondaryBrush}" />
 											</ObjectAnimationUsingKeyFrames>
 										</Storyboard>
 										<VisualState.Setters>
diff --git a/src/Files.App/Views/PaneHolderPage.xaml b/src/Files.App/Views/PaneHolderPage.xaml
@@ -122,7 +122,7 @@
 				<icore:ChangePropertyAction
 					PropertyName="CurrentInstanceBorderBrush"
 					TargetObject="{Binding ElementName=PaneLeft}"
-					Value="{ThemeResource DividerStrokeColorDefault}" />
+					Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
 				<icore:ChangePropertyAction
 					PropertyName="CurrentInstanceBorderThickness"
 					TargetObject="{Binding ElementName=PaneLeft}"
@@ -142,7 +142,7 @@
 				<icore:ChangePropertyAction
 					PropertyName="CurrentInstanceBorderBrush"
 					TargetObject="{Binding ElementName=PaneRight}"
-					Value="{ThemeResource DividerStrokeColorDefault}" />
+					Value="{ThemeResource DividerStrokeColorDefaultBrush}" />
 				<icore:ChangePropertyAction
 					PropertyName="CurrentInstanceBorderThickness"
 					TargetObject="{Binding ElementName=PaneRight}"
diff --git a/src/Files.App/Views/Properties/GeneralPage.xaml b/src/Files.App/Views/Properties/GeneralPage.xaml
@@ -333,7 +333,7 @@
 							Grid.ColumnSpan="2"
 							Height="1"
 							Margin="-16,0"
-							Background="{ThemeResource DividerStrokeColorDefault}" />
+							Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 
 						<!--  Date Created  -->
 						<TextBlock
@@ -714,7 +714,7 @@
 							Grid.ColumnSpan="3"
 							Height="1"
 							Margin="-16,0"
-							Background="{ThemeResource DividerStrokeColorDefault}" />
+							Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 
 						<!--  Hidden  -->
 						<TextBlock
diff --git a/src/Files.App/Views/Properties/MainPropertiesPage.xaml b/src/Files.App/Views/Properties/MainPropertiesPage.xaml
@@ -160,7 +160,7 @@
 					<!--  Save/Cancel buttons  -->
 					<Grid
 						Grid.Row="1"
-						Background="{ThemeResource CardBackgroundFillColorSecondary}"
+						Background="{ThemeResource CardBackgroundFillColorSecondaryBrush}"
 						BorderBrush="{ThemeResource CardStrokeColorDefaultBrush}"
 						BorderThickness="0,1,0,0">
 						<StackPanel
diff --git a/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml b/src/Files.App/Views/Properties/SecurityAdvancedPage.xaml
@@ -273,7 +273,7 @@
 							Grid.Column="1"
 							HorizontalAlignment="Left"
 							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondary}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 							Style="{StaticResource App.Theme.CaptionTextBlockStyle}"
 							Text="{helpers:ResourceString Name=Type}"
 							TextTrimming="CharacterEllipsis"
@@ -289,7 +289,7 @@
 							Margin="4,0"
 							HorizontalAlignment="Left"
 							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondary}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 							Style="{StaticResource App.Theme.CaptionTextBlockStyle}"
 							Text="{helpers:ResourceString Name=Principal}"
 							TextTrimming="CharacterEllipsis"
@@ -305,7 +305,7 @@
 							Margin="4,0"
 							HorizontalAlignment="Left"
 							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondary}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 							Style="{StaticResource App.Theme.CaptionTextBlockStyle}"
 							Text="{helpers:ResourceString Name=Access}"
 							TextTrimming="CharacterEllipsis"
@@ -321,7 +321,7 @@
 							Margin="4,0"
 							HorizontalAlignment="Left"
 							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondary}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 							Style="{StaticResource App.Theme.CaptionTextBlockStyle}"
 							Text="{helpers:ResourceString Name=Inherited}"
 							TextTrimming="CharacterEllipsis"
@@ -337,7 +337,7 @@
 							Margin="4,0"
 							HorizontalAlignment="Left"
 							VerticalAlignment="Center"
-							Foreground="{ThemeResource TextFillColorSecondary}"
+							Foreground="{ThemeResource TextFillColorSecondaryBrush}"
 							Style="{StaticResource App.Theme.CaptionTextBlockStyle}"
 							Text="{helpers:ResourceString Name=SecurityAdvancedAppliesTo}"
 							TextTrimming="CharacterEllipsis"
diff --git a/src/Files.App/Views/Properties/SecurityPage.xaml b/src/Files.App/Views/Properties/SecurityPage.xaml
@@ -116,7 +116,7 @@
 				<Border
 					Grid.Row="1"
 					Height="1"
-					Background="{ThemeResource DividerStrokeColorDefault}" />
+					Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 
 				<!--  Access Control Entries List  -->
 				<ScrollViewer
@@ -230,7 +230,7 @@
 					Grid.Row="1"
 					Height="1"
 					Margin="-12,0"
-					Background="{ThemeResource DividerStrokeColorDefault}" />
+					Background="{ThemeResource DividerStrokeColorDefaultBrush}" />
 
 				<!--  Permission Allow/Deny CheckBoxes  -->
 				<Grid
diff --git a/src/Files.App/Views/Settings/AppearancePage.xaml b/src/Files.App/Views/Settings/AppearancePage.xaml
@@ -54,7 +54,7 @@
 							Width="32"
 							Height="12"
 							VerticalAlignment="Bottom"
-							Background="{ThemeResource LayerOnMicaBaseAltFillColorDefault}"
+							Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
 							BorderBrush="{ThemeResource ControlElevationBorderBrush}"
 							BorderThickness="1,1,1,0"
 							CornerRadius="4,4,0,0" />
@@ -70,7 +70,7 @@
 						Grid.Row="1"
 						Height="50"
 						VerticalAlignment="Bottom"
-						Background="{ThemeResource LayerOnMicaBaseAltFillColorDefault}"
+						Background="{ThemeResource LayerOnMicaBaseAltFillColorDefaultBrush}"
 						BorderBrush="{ThemeResource ControlElevationBorderBrush}"
 						BorderThickness="0,0,0,.5" />
 
diff --git a/src/Files.App/Views/Settings/TagsPage.xaml b/src/Files.App/Views/Settings/TagsPage.xaml
@@ -67,7 +67,7 @@
 							x:Name="AddTagGrid"
 							Padding="32,12"
 							x:Load="{x:Bind ViewModel.IsCreatingNewTag, Mode=OneWay}"
-							Background="{ThemeResource CardBackgroundFillColorDefault}"
+							Background="{ThemeResource CardBackgroundFillColorDefaultBrush}"
 							BorderBrush="{ThemeResource ControlElevationBorderBrush}"
 							BorderThickness="0,0,0,1">
 							<Grid.ColumnDefinitions>
