From 6966e161f4abeebd566a8db47a4d2717a89fddca Mon Sep 17 00:00:00 2001 From: Tasha Titova Date: Thu, 24 Feb 2022 11:19:51 -0800 Subject: [PATCH] [ TreeView ] Multi Select state doesn't meet high contrast requirements (#6729) * date pickers * adding time picker and flyout theming * update background smoke for hc * fix multi select in hc * updating focus visuals * rename * update verification files Co-authored-by: Karen Lai --- dev/TreeView/TreeViewItem.xaml | 47 +- dev/TreeView/TreeView_themeresources.xaml | 18 +- .../verification/TreeView-10.xml | 415 ++++++++++++++++++ .../verification/TreeView-7.xml | 4 +- 4 files changed, 460 insertions(+), 24 deletions(-) create mode 100644 test/MUXControlsTestApp/verification/TreeView-10.xml diff --git a/dev/TreeView/TreeViewItem.xaml b/dev/TreeView/TreeViewItem.xaml index e1206b43d3..be1bf36335 100644 --- a/dev/TreeView/TreeViewItem.xaml +++ b/dev/TreeView/TreeViewItem.xaml @@ -17,6 +17,7 @@ + @@ -126,6 +127,7 @@ + @@ -154,7 +156,13 @@ contract7Present:RadiusY="2"/> - + @@ -162,16 +170,18 @@ - - + - - - - - - + + @@ -45,6 +46,7 @@ 0 4,2 0,3,0,5 + 0 28 28 20 @@ -78,6 +80,7 @@ + @@ -89,6 +92,7 @@ 0 4,2 0,3,0,5 + 0 28 28 20 @@ -96,22 +100,22 @@ - + - + - + - + @@ -121,7 +125,8 @@ - + + @@ -133,6 +138,7 @@ 1 4,2 0,3,0,5 + 1 28 28 20 diff --git a/test/MUXControlsTestApp/verification/TreeView-10.xml b/test/MUXControlsTestApp/verification/TreeView-10.xml new file mode 100644 index 0000000000..c2335ecb1e --- /dev/null +++ b/test/MUXControlsTestApp/verification/TreeView-10.xml @@ -0,0 +1,415 @@ +[Microsoft.UI.Xaml.Controls.TreeView] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Height=400 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + Width=400 + [Microsoft.UI.Xaml.Controls.TreeViewList] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + Name=ListControl + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.Border] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.ScrollViewer] + Background=#00FFFFFF + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + Name=ScrollViewer + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.Border] + Background=[NULL] + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Name=Root + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.Grid] + Background=#00FFFFFF + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.ScrollContentPresenter] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + Name=ScrollContentPresenter + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.ItemsPresenter] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.ContentControl] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Collapsed + [Windows.UI.Xaml.Controls.ItemsStackPanel] + Background=[NULL] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Microsoft.UI.Xaml.Controls.TreeViewItem] + Background=#00FFFFFF + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=4,4,4,4 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + GlyphBrush=#E4000000 + Margin=0,0,0,0 + MinHeight=28 + MinWidth=88 + Padding=0,0,0,0 + RenderSize=400,32 + Visibility=Visible + [Windows.UI.Xaml.Controls.Grid] + Background=#00FFFFFF + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=4,4,4,4 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=4,2,4,2 + Name=ContentPresenterGrid + Padding=0,3,0,5 + RenderSize=392,28 + Visibility=Visible + [Windows.UI.Xaml.Shapes.Rectangle] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Height=16 + Margin=0,0,0,0 + Name=SelectionIndicator + RenderSize=3,16 + StrokeThickness=1 + Visibility=Visible + Width=3 + [Windows.UI.Xaml.Controls.Grid] + Background=[NULL] + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=4,4,4,4 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Name=MultiSelectGrid + Padding=0,0,0,0 + RenderSize=392,20 + Visibility=Visible + [Windows.UI.Xaml.Controls.Grid] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=0,20 + Visibility=Visible + [Windows.UI.Xaml.Controls.CheckBox] + Background=#00FFFFFF + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=4,4,4,4 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=10,0,0,0 + MinHeight=28 + MinWidth=32 + Name=MultiSelectCheckBox + Padding=8,5,0,0 + RenderSize=0,0 + Visibility=Collapsed + Width=32 + [Windows.UI.Xaml.Controls.Border] + Background=#FF0078D7 + BorderBrush=#FFFFFFFF + BorderThickness=1,1,1,1 + CornerRadius=4,4,4,4 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Height=20 + Margin=0,0,0,0 + MinWidth=20 + Name=MultiArrangeOverlayTextBorder + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Collapsed + [Windows.UI.Xaml.Controls.TextBlock] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#FFFFFFFF + Margin=0,0,0,0 + Name=MultiArrangeOverlayText + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Visible + [Windows.UI.Xaml.Controls.Grid] + Background=#00FFFFFF + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Name=ExpandCollapseChevron + Padding=14,0,14,0 + RenderSize=40,20 + Visibility=Visible + [Windows.UI.Xaml.Controls.TextBlock] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Height=12 + Margin=0,0,0,0 + Name=CollapsedGlyph + Padding=2,2,2,2 + RenderSize=12,12 + Visibility=Visible + Width=12 + [Windows.UI.Xaml.Controls.TextBlock] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Height=12 + Margin=0,0,0,0 + Name=ExpandedGlyph + Padding=2,2,2,2 + RenderSize=0,0 + Visibility=Collapsed + Width=12 + [Windows.UI.Xaml.Controls.ContentPresenter] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + MinHeight=20 + Name=ContentPresenter + Padding=0,0,0,0 + RenderSize=352,20 + Visibility=Visible + [Windows.UI.Xaml.Controls.TextBlock] + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=42,19 + Visibility=Visible + [Windows.UI.Xaml.Controls.ContentControl] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#E4000000 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Collapsed + [Windows.UI.Xaml.Controls.Grid] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=0,0,0,0 + RenderSize=400,400 + Visibility=Visible + [Windows.UI.Xaml.Controls.Grid] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=1,1,1,1 + RenderSize=0,0 + Visibility=Collapsed + [Windows.UI.Xaml.Controls.Primitives.ScrollBar] + Background=#00FFFFFF + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=3,3,3,3 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#00FFFFFF + Margin=0,0,0,0 + MinHeight=12 + MinWidth=12 + Name=VerticalScrollBar + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Visible + [Windows.UI.Xaml.Controls.Grid] + Background=[NULL] + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Padding=1,1,1,1 + RenderSize=0,0 + Visibility=Collapsed + [Windows.UI.Xaml.Controls.Primitives.ScrollBar] + Background=#00FFFFFF + BorderBrush=#00FFFFFF + BorderThickness=0,0,0,0 + CornerRadius=3,3,3,3 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Foreground=#00FFFFFF + Margin=0,0,0,0 + MinHeight=12 + MinWidth=12 + Name=HorizontalScrollBar + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Visible + [Windows.UI.Xaml.Controls.Border] + Background=#00FFFFFF + BorderBrush=[NULL] + BorderThickness=0,0,0,0 + CornerRadius=0,0,0,0 + FocusVisualPrimaryBrush=#E4000000 + FocusVisualPrimaryThickness=2,2,2,2 + FocusVisualSecondaryBrush=#B3FFFFFF + FocusVisualSecondaryThickness=1,1,1,1 + Margin=0,0,0,0 + Name=ScrollBarSeparator + Padding=0,0,0,0 + RenderSize=0,0 + Visibility=Collapsed diff --git a/test/MUXControlsTestApp/verification/TreeView-7.xml b/test/MUXControlsTestApp/verification/TreeView-7.xml index e7d3c0dbed..c2335ecb1e 100755 --- a/test/MUXControlsTestApp/verification/TreeView-7.xml +++ b/test/MUXControlsTestApp/verification/TreeView-7.xml @@ -176,9 +176,9 @@ Width=3 [Windows.UI.Xaml.Controls.Grid] Background=[NULL] - BorderBrush=[NULL] + BorderBrush=#00FFFFFF BorderThickness=0,0,0,0 - CornerRadius=0,0,0,0 + CornerRadius=4,4,4,4 FocusVisualPrimaryBrush=#E4000000 FocusVisualPrimaryThickness=2,2,2,2 FocusVisualSecondaryBrush=#B3FFFFFF